药剂保管新增

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -1217,29 +1217,32 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             ew1.eq("process_id", processId);
             ew1.eq("type", type);
             List<ProcessAudit> list = processAuditMapper.selectList(ew1);
-            if(list.size() > 0){
-            	for (ProcessAudit processAudit : list) {
-            		if(processAudit.getSubId().equals(subId) && !processAudit.getSubData().equals(subData)){
-            			//修改
-            			processAudit.setSubData(subData);
-      				    processAudit.setOperationTime(operationTime);
-                        processAuditMapper.updateById(processAudit);
-            		}else{
-            			//新增
-                        ProcessAudit processAudit1 = new ProcessAudit();
-                        processAudit1.setType(type);
-                        processAudit1.setSubId(subId);
-                        processAudit1.setSubData(subData);
-                        processAudit1.setOperationTime(operationTime);
-                        processAudit1.setDepotId(depotId);
-                        processAudit1.setProcessId(processId);
-                        processAuditMapper.insert(processAudit1);
-            		}
-				}
-            	//修改第一条数据的状态
-        		list.get(0).setAuditState(auditState);
-        		processAuditMapper.updateById(list.get(0));
-            	
+            if(list.size() > 0){//修改
+            	QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
+            	ew2.eq("process_id", processId);
+            	ew2.eq("type", type);
+            	ew2.eq("sub_id", subId);
+                List<ProcessAudit> list1 = processAuditMapper.selectList(ew2);
+                if(list1.size()>0){
+                	for (ProcessAudit processAudit : list1) {
+                		if(processAudit.getSubId().equals(subId) && !processAudit.getSubData().equals(subData)){
+                			//修改
+                			processAudit.setSubData(subData);
+          				    processAudit.setOperationTime(operationTime);
+                            processAuditMapper.updateById(processAudit);
+                		}
+    				}
+                }else{
+                	//新增
+                    ProcessAudit processAudit1 = new ProcessAudit();
+                    processAudit1.setType(type);
+                    processAudit1.setSubId(subId);
+                    processAudit1.setSubData(subData);
+                    processAudit1.setOperationTime(operationTime);
+                    processAudit1.setDepotId(depotId);
+                    processAudit1.setProcessId(processId);
+                    processAuditMapper.insert(processAudit1);
+                }
             }else{
             	//第一条数据新增
                 ProcessAudit processAudit = new ProcessAudit();
@@ -1259,6 +1262,16 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             }
 
         }
+        QueryWrapper<ProcessAudit> ew2 = new QueryWrapper<>();
+    	ew2.eq("process_id", processId);
+    	ew2.eq("type", type);
+    	ew2.eq("result", 2);
+        List<ProcessAudit> list2 = processAuditMapper.selectList(ew2);
+        if(!list2.get(0).getAuditState().equals(auditState)){
+        	//修改第一条数据的状态
+            list2.get(0).setAuditState(auditState);
+    		processAuditMapper.updateById(list2.get(0));
+        }
     
 	}