From fde27b9e71c408010e0a7c58a2dbe989e81ae260 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 21 Aug 2024 19:32:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(89221):=20=E6=A0=87=E5=87=86=E8=A7=A3?=
 =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B--=E5=88=86=E5=8F=91=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9--=E5=88=86=E5=8F=91--=E5=88=86=E5=8F=91=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E7=9A=84=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=BA=94=E8=AF=A5=E5=8E=BB=E6=8E=89=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessStandardInterpret.java               |  5 +++++
 .../service/impl/StandardInterpretFlow.java            |  4 ++--
 .../service/impl/StandardInterpretFlowServiceImpl.java | 10 ++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

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<ProcessApprovalRecord> processApprovalRecordList = processApprovalRecordService.list(
                     new LambdaQueryWrapper<ProcessApprovalRecord>()
                         .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<ProcessApprovalRecord>()
+                            .eq(ProcessApprovalRecord::getProcessInstanceId,
+                                    processApprovalRecord.getProcessInstanceId())
+                            .isNotNull(ProcessApprovalRecord::getParentTaskId));
+            if (count > 0 || StandardInterpretCommon.MASTER_INTERPRET_AGAIN_DISTRIBUTE.equals(node)){
+                processStandardInterpret.setShowReject(YesOrNoEnum.NO.getValue());
+            }
         }
 
         // 通过 标准解读流程id 查询 标准解读流程_条款中间表_子表