gaodd 4 years ago
parent
commit
1903015fda

+ 2 - 16
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -669,6 +669,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
669
         //根据唯一的流程标识 获取该流程下的所有数据
669
         //根据唯一的流程标识 获取该流程下的所有数据
670
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
670
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
671
         ew.eq("process_id", processId);
671
         ew.eq("process_id", processId);
672
+        ew.isNotNull("to_people");
673
+        ew.isNotNull("from_people");
672
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
674
         List<ProcessAudit> list = processAuditMapper.selectList(ew);
673
         //map.put("data", list);
675
         //map.put("data", list);
674
         
676
         
@@ -1588,7 +1590,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1588
                			if(j-1<=list.size()-1){
1590
                			if(j-1<=list.size()-1){
1589
                				// 业务
1591
                				// 业务
1590
                				ProcessAudit audit = list.get(j-1);
1592
                				ProcessAudit audit = list.get(j-1);
1591
-               				if(null != audit.getToPeople()){
1592
                					item.setAuditTime(audit.getAuditTime());
1593
                					item.setAuditTime(audit.getAuditTime());
1593
                    				item.setContent(audit.getToPeople());
1594
                    				item.setContent(audit.getToPeople());
1594
                    				if(flag){//不通过
1595
                    				if(flag){//不通过
@@ -1600,21 +1601,6 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1600
                            		}else{
1601
                            		}else{
1601
                            			item.setAuditState(audit.getAuditState());
1602
                            			item.setAuditState(audit.getAuditState());
1602
                            		}
1603
                            		}
1603
-               				}else{
1604
-               					ProcessAudit audit1 = list.get(j);
1605
-               					item.setAuditTime(audit1.getAuditTime());
1606
-                   				item.setContent(audit1.getToPeople());
1607
-                   				if(flag){//不通过
1608
-                           			if(j-1==list.size()-1){
1609
-                           				item.setAuditState(2);
1610
-                           			}else{
1611
-                           				item.setAuditState(1);
1612
-                           			}
1613
-                           		}else{
1614
-                           			item.setAuditState(audit1.getAuditState());
1615
-                           		}
1616
-                   				j++;
1617
-               				}
1618
                			}
1604
                			}
1619
        			}
1605
        			}
1620
                	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){
1606
                	if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){