From 21f2331f6291b01be9c81150690d1e00f1d373e1 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 29 Nov 2023 10:34:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRecheck/controller/ESRecheckController.java   | 12 ++++++++++++
 .../process/esRecheck/entity/ProcessEsRecheck.java  |  6 ++++++
 .../esRecheck/service/ProcessEsRecheckService.java  |  2 ++
 .../service/impl/ProcessEsRecheckServiceImpl.java   | 13 +++++++++++++
 .../laws/enterprise/job/ESRecheckPlanJob.java       |  9 ++++++++-
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
index 7c9b91de..b70d5120 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
@@ -45,6 +45,18 @@ public class ESRecheckController {
         return Result.OK();
     }
 
+    /**
+     * 企标复审流程查询是否显示标准化工程师选择联络人节点
+     *
+     * @param id
+     */
+    @AutoLog(value = "企标复审流程-是否显示标准化工程师选择联络人节点")
+    @ApiOperation(value="企标复审流程-是否显示标准化工程师选择联络人节点", notes="企标复审流程-是否显示标准化工程师选择联络人节点")
+    @GetMapping("/isShowFirstNode")
+    public Result<?> isShowFirstNode(@RequestParam("id") String id) {
+        return Result.OK(recheckService.isShowFirstNode(id));
+    }
+
     /**
      * 保存到待办
      * @param recheckData
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
index 4e7bf89c..2b0d4a37 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
@@ -131,6 +131,12 @@ public class ProcessEsRecheck implements Serializable {
     @ApiModelProperty(value = "复审计划Id")
     private String recheckPlanId;
 
+    /**
+     * 是否显示
+     */
+    @ApiModelProperty(value = "0不显示 1显示")
+    private Integer ShowFirstNode;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java
index 60edcf2c..1b4f4385 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java
@@ -22,4 +22,6 @@ public interface ProcessEsRecheckService extends IService<ProcessEsRecheck> {
     void approval(ESRecheckDataVO recheckData, boolean pass);
 
     ESRecheckDataVO getDraftData(String draftId, String projectId);
+
+    boolean isShowFirstNode(String id);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index 8e1c75af..581edcbc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -56,6 +56,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         String userId = UserUtils.getUserId();
         // 业务数据
         ProcessEsRecheck esRecheck = recheckData.getData();
+        // 手动发起不显示第一个节点
+        esRecheck.setShowFirstNode(YesOrNoEnum.NO.getInteger());
         // 通用数据
         CommonVO common = recheckData.getCommon();
         // 人员数据
@@ -213,6 +215,17 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
             return recheckDataVO;
         }
     }
+
+    @Override
+    public boolean isShowFirstNode(String id) {
+        ProcessEsRecheck es = this.getById(id);
+        if (es == null) {
+            throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        } else {
+            Integer showFirstNode = es.getShowFirstNode();
+            return Objects.equals(showFirstNode, YesOrNoEnum.YES.getInteger());
+        }
+    }
 }
 
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
index 2849d991..98ddd57d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
@@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
+import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.laws.system.service.ILawsContactManageService;
@@ -108,8 +109,14 @@ public class ESRecheckPlanJob implements Job {
 
     private ESRecheckDataVO getEsRecheckDataVO(LawsEnterpriseStandard es, String standardizationUser, String standardEngineer) {
         ESRecheckDataVO esRecheckDataVO = new ESRecheckDataVO();
-        ProcessEsRecheck recheck = new ProcessEsRecheck();
+        ProcessEsRecheck recheck = BeanCopyUtils.copyBean(es, ProcessEsRecheck.class);
+        recheck.setId(null);
         recheck.setStandardId(es.getId());
+        if (standardizationUser == null) {
+            recheck.setShowFirstNode(YesOrNoEnum.YES.getInteger());
+        } else {
+            recheck.setShowFirstNode(YesOrNoEnum.NO.getInteger());
+        }
         CommonVO commonVO = new CommonVO();
         commonVO.setPrcName(es.getStandardNumber() + "-" + es.getStandardName() + "-复审");
         Map<String, Object> map = new HashMap<>();