gaodd лет назад: 5
Родитель
Сommit
556d134bb3

+ 9 - 5
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -900,14 +900,18 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
900 900
         Page<ProcessAudit> pageInfo = processAuditMapper.selectPage(page, ew);
901 901
         if (pageInfo.getTotal() > 0) {
902 902
             for (ProcessAudit processAudit : pageInfo.getRecords()) {
903
-            	//赋值最新的状态
904
-            	/*QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
903
+            	//赋值状态
904
+            	QueryWrapper<ProcessAudit> ew1 = new QueryWrapper<>();
905
+            	ew1.eq("from_people", processAudit.getApplyPeople());
905 906
             	ew1.eq("process_id", processAudit.getProcessId());
906
-            	ew1.eq("result", 1);//第一条数据
907 907
             	List<ProcessAudit> list = processAuditMapper.selectList(ew1);
908 908
             	if(list.size()>0){
909
-            		processAudit.setAuditState(list.get(0).getAuditState());
910
-            	}*/
909
+            		for (ProcessAudit processAudit2 : list) {
910
+						if(processAudit2.getAuditState() != processAudit.getAuditState()){
911
+							processAudit.setAuditState(processAudit2.getAuditState());
912
+						}
913
+					}
914
+            	}
911 915
             	
912 916
                 //根据仓房id获取仓房名称
913 917
             	if(null != processAudit.getHouseId()){