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