gaodd %!s(int64=4) %!d(string=hai) anos
pai
achega
6314fb189d

+ 14 - 0
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -1600,6 +1600,20 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1600
                            		}else{
1600
                            		}else{
1601
                            			item.setAuditState(audit.getAuditState());
1601
                            			item.setAuditState(audit.getAuditState());
1602
                            		}
1602
                            		}
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++;
1603
                				}
1617
                				}
1604
                			}
1618
                			}
1605
        			}
1619
        			}