diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java index 44f4aab4..d72e5566 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java @@ -92,5 +92,10 @@ public class ProcessStandardInterpret extends BaseEntity { @ApiModelProperty(value = "批准人员") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") private String approvePersonId; + /**标准主解读人分发节点是否显示驳回(字典:1:是,2:否)*/ + @ApiModelProperty(value = "标准主解读人分发节点是否显示驳回(字典:1:是,0:否)") + @Dict(dicCode = "yn") + @TableField(exist = false) + private String showReject = "1"; } 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 6b3b7d34..ede90271 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 @@ -102,6 +102,8 @@ public class StandardInterpretFlow implements WorkCenterService { public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) { ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class); + ProcessApprovalRecordService processApprovalRecordService = + SpringContextUtil.getBean(ProcessApprovalRecordService.class); // 更新流程人员变量 processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId); // 解读人填写信息(分发) @@ -158,8 +160,6 @@ public class StandardInterpretFlow implements WorkCenterService { } // 查询其他子流程 - ProcessApprovalRecordService processApprovalRecordService = - SpringContextUtil.getBean(ProcessApprovalRecordService.class); List processApprovalRecordList = processApprovalRecordService.list( new LambdaQueryWrapper() .eq(ProcessApprovalRecord::getProcessInstanceId, processApprovalRecord.getProcessInstanceId()) 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 f80a2cc3..0100394c 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 @@ -730,6 +730,16 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe && YesOrNoEnum.NO.getValue().equals(processStandardInterpret.getChooseClause())){ processStandardInterpretClauseList = new ArrayList<>(); } + // 是否显示驳回 + // 查询是否存在子流程 + int count = processApprovalRecordService.count( + new LambdaQueryWrapper() + .eq(ProcessApprovalRecord::getProcessInstanceId, + processApprovalRecord.getProcessInstanceId()) + .isNotNull(ProcessApprovalRecord::getParentTaskId)); + if (count > 0 || StandardInterpretCommon.MASTER_INTERPRET_AGAIN_DISTRIBUTE.equals(node)){ + processStandardInterpret.setShowReject(YesOrNoEnum.NO.getValue()); + } } // 通过 标准解读流程id 查询 标准解读流程_条款中间表_子表