|
@@ -898,6 +898,15 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
898
|
Page<ProcessAudit> pageInfo = processAuditMapper.selectPage(page, ew);
|
898
|
Page<ProcessAudit> pageInfo = processAuditMapper.selectPage(page, ew);
|
899
|
if (pageInfo.getTotal() > 0) {
|
899
|
if (pageInfo.getTotal() > 0) {
|
900
|
for (ProcessAudit processAudit : pageInfo.getRecords()) {
|
900
|
for (ProcessAudit processAudit : pageInfo.getRecords()) {
|
|
|
901
|
+ //赋值最新的状态
|
|
|
902
|
+ QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
|
|
|
903
|
+ ew1.eq("process_id", processAudit.getProcessId());
|
|
|
904
|
+ ew1.eq("result", 1);//第一条数据
|
|
|
905
|
+ List<ProcessAudit> list = processAuditMapper.selectList(ew1);
|
|
|
906
|
+ if(list.size()>0){
|
|
|
907
|
+ processAudit.setAuditState(list.get(0).getAuditState());
|
|
|
908
|
+ }
|
|
|
909
|
+
|
901
|
//根据仓房id获取仓房名称
|
910
|
//根据仓房id获取仓房名称
|
902
|
if(null != processAudit.getHouseId()){
|
911
|
if(null != processAudit.getHouseId()){
|
903
|
ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
|
912
|
ResponseEntity<String> forEntity = restTemplate.getForEntity(MyConstant.SYSTEM_WAREHOUSE + processAudit.getHouseId(), String.class);
|