diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java index e6033452..2b2ae1af 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlow.java @@ -30,10 +30,10 @@ public class StandardInterpretFlow implements WorkCenterService { // 删除业务表数据 ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); processAllService.physicalDeleteByProjectId("process_standard_interpret", processAll.getProjectId()); - processAllService.physicalDeleteByProjectId("process_standard_interpret_clause", - processAll.getProjectId()); - processAllService.physicalDeleteByProjectId("process_standard_interpret_clause_sublist", - processAll.getProjectId()); +// processAllService.physicalDeleteByProjectId("process_standard_interpret_clause", +// processAll.getProjectId()); +// processAllService.physicalDeleteByProjectId("process_standard_interpret_clause_sublist", +// processAll.getProjectId()); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 3c0b3897..442f5555 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -547,7 +547,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe FlowApproveInfo flowApproveInfo = flowUtility.queryFlowApproveInfo(projectId, taskId); standardInterpretFlowVO.setProcessAll(flowApproveInfo.getProcessAll()); standardInterpretFlowVO.setProcessApprovalRecord(flowApproveInfo.getProcessApprovalRecord()); - + standardInterpretFlowVO.setInfoJsonStr(flowApproveInfo.getInfoJsonStr()); // 查询业务信息 StandardInterpretDTO data = queryBusinessData(flowApproveInfo.getProcessAll(), flowApproveInfo.getProcessApprovalRecord()); @@ -567,7 +567,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe // 项目id String projectId = processAll.getProjectId(); // 当前任务节点 - String node = processApprovalRecord.getNodeId(); + String node = StringUtils.isNotBlank(processApprovalRecord.getNodeId()) + ? processApprovalRecord.getNodeId() : StandardInterpretCommon.REGULATORY_ENGINEER_START; LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 通过 projectId 查询 标准解读流程 @@ -1465,6 +1466,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe .saveOrUpdateBatch(processStandardInterpretClauseSublistList); } break; + // 会签(分发) + case StandardInterpretCommon.JOINTLY_SIGN_1: // 会签(不分发) case StandardInterpretCommon.JOINTLY_SIGN_2: // 各涉及部门科室经理审核(不分发) @@ -1475,13 +1478,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe if (passs){ processStandardInterpretClauseSublistService .saveOrUpdateBatch(processStandardInterpretClauseSublistList); - }else { - // 驳回 - // 删除 标准解读流程_条款中间表_子表 数据 -// List idList = processStandardInterpretClauseSublistList.stream() -// .map(ProcessStandardInterpretClauseSublist::getId) -// .collect(Collectors.toList()); -// processStandardInterpretClauseSublistService.removeByIds(idList); } break; // 标准主解读汇总(分发) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java index 56e364bf..2ba1cc3d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java @@ -32,4 +32,8 @@ public class StandardInterpretFlowVO { /**map(参数)*/ @ApiModelProperty(value = "map(参数)") private Map map; + + /**草稿信息json字符串*/ + @ApiModelProperty(value = "草稿信息json字符串") + private String infoJsonStr; }