gaodd 5 роки тому
батько
коміт
c1e65f79b4

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

@@ -75,7 +75,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
75
 		
75
 		
76
 		JSONObject jsStr = JSONObject.parseObject(parameter);
76
 		JSONObject jsStr = JSONObject.parseObject(parameter);
77
 		String type = jsStr.getString("type");//流程类型
77
 		String type = jsStr.getString("type");//流程类型
78
-		Integer mainId = jsStr.getInteger("mainId");//主流程id
78
+		//Integer mainId = jsStr.getInteger("mainId");//主流程id
79
 		Integer houseId = jsStr.getInteger("houseId");//仓房id
79
 		Integer houseId = jsStr.getInteger("houseId");//仓房id
80
 		Integer depotId = jsStr.getInteger("depotId");//库id
80
 		Integer depotId = jsStr.getInteger("depotId");//库id
81
 		Integer applyPeople = jsStr.getInteger("applyPeople");//申请人id
81
 		Integer applyPeople = jsStr.getInteger("applyPeople");//申请人id
@@ -104,6 +104,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
104
 		JSONObject row = null;
104
 		JSONObject row = null;
105
 		for (int i = 0; i < jsonArray.size(); i++) {
105
 		for (int i = 0; i < jsonArray.size(); i++) {
106
 			row = jsonArray.getJSONObject(i); 
106
 			row = jsonArray.getJSONObject(i); 
107
+			Integer mainId = (Integer) row.get("mainId");//主流程id
107
 			Integer subId = (Integer) row.get("subId");//子流程id
108
 			Integer subId = (Integer) row.get("subId");//子流程id
108
 			Integer subData = Integer.parseInt(row.getString("subData"));//子流程数据
109
 			Integer subData = Integer.parseInt(row.getString("subData"));//子流程数据
109
 			String operationTime = (String) row.get("operationTime");//子流程的操作时间
110
 			String operationTime = (String) row.get("operationTime");//子流程的操作时间
@@ -365,7 +366,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
365
 		JSONObject jsStr = JSONObject.parseObject(parameter);
366
 		JSONObject jsStr = JSONObject.parseObject(parameter);
366
 		String processId = jsStr.getString("processId");//流程id 每一条明细都是和第一条保存提交的流程id一样
367
 		String processId = jsStr.getString("processId");//流程id 每一条明细都是和第一条保存提交的流程id一样
367
 		String type = jsStr.getString("type");//流程类型
368
 		String type = jsStr.getString("type");//流程类型
368
-		Integer mainId = jsStr.getInteger("mainId");//主流程id
369
+		//Integer mainId = jsStr.getInteger("mainId");//主流程id
369
 		//Integer houseId = jsStr.getInteger("houseId");//仓房id
370
 		//Integer houseId = jsStr.getInteger("houseId");//仓房id
370
 		//Integer depotId = jsStr.getInteger("depotId");//库id
371
 		//Integer depotId = jsStr.getInteger("depotId");//库id
371
 		//Integer applyPeople = jsStr.getInteger("applyPeople");//申请人id
372
 		//Integer applyPeople = jsStr.getInteger("applyPeople");//申请人id
@@ -384,6 +385,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
384
 		JSONObject row = null;
385
 		JSONObject row = null;
385
 		for (int i = 0; i < jsonArray.size(); i++) {
386
 		for (int i = 0; i < jsonArray.size(); i++) {
386
 			row = jsonArray.getJSONObject(i);
387
 			row = jsonArray.getJSONObject(i);
388
+			Integer mainId = (Integer) row.get("mainId");//主流程id
387
 			Integer subId = (Integer) row.get("subId");//子流程id
389
 			Integer subId = (Integer) row.get("subId");//子流程id
388
 			Integer subData = (Integer) row.get("subData");//子流程数据
390
 			Integer subData = (Integer) row.get("subData");//子流程数据
389
 			String operationTime = (String) row.get("operationTime");//子流程的操作时间
391
 			String operationTime = (String) row.get("operationTime");//子流程的操作时间