药剂保管

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

@@ -1172,6 +1172,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         String type = jsStr.optString("type");//流程类型
         Integer houseId = jsStr.optInt("houseId");//仓房id
         Integer depotId = jsStr.optInt("depotId");//库id
+        Integer auditState = jsStr.optInt("auditState");//状态
         JSONArray jsonArray = jsStr.optJSONArray("subList");//子流程数据
         JSONObject row = null;
         for (int i = 0; i < jsonArray.length(); i++) {
@@ -1185,7 +1186,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             List<ProcessAudit> list = processAuditMapper.selectList(ew1);
             if (list.size() > 0) {
             	if(null != auditId && 0 != auditId){
-            		 //修改
+            		 //修改 值
             		for (ProcessAudit processAudit : list) {
              		   if(processAudit.getId().equals(auditId)){
              			  if (!processAudit.getSubData().equals(subData)) {
@@ -1195,6 +1196,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                           }
                  	   }
  			        }
+            		
             	}else{
             		//新增
                     ProcessAudit processAudit = new ProcessAudit();
@@ -1206,7 +1208,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                     processAudit.setProcessId(processId);
                     processAuditMapper.insert(processAudit);
             	}
-               
+            	//修改第一条数据的状态
+        		list.get(0).setAuditState(auditState);
+        		processAuditMapper.updateById(list.get(0));
                 
             } else {
                 //第一条数据新增
@@ -1218,6 +1222,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 processAudit.setDepotId(depotId);
                 processAudit.setResult(2);//第一条数据 保存并审批  1是0否 2和流程无关的数据
                 processAudit.setProcessId(processId);
+                processAudit.setAuditState(auditState);
                 Date date = new Date();
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                 String dateString = formatter.format(date);