From eee50f7dbf2bb82b41c2be85bfb287a6baad81b6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Dec 2023 11:53:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9D=9F=E5=90=8E=E5=AD=97=E6=AE=B5=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/entity/ProcessEsRevision.java  |  6 +++++
 .../ProcessESRevisionEndListener.java         | 25 ++++++++++++++++++-
 .../service/impl/EsRevisionServiceImpl.java   |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 36908ee5..4eb948ee 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -251,6 +251,12 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "工作组")
     private String workGroup;
 
+    /**
+     * 主起草人
+     */
+    @ApiModelProperty(value = "主起草人")
+    private String mainDraftUser;
+
     /**
      * 总工程师
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
index cd6fbc52..d3560c1a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
@@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
 import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
 import com.jero.modules.activiti.process.esRevision.entity.vo.ReviewMeetingDetailVO;
@@ -17,11 +19,13 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService;
 import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
+import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.tag.enums.TableNameEnum;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -69,8 +73,27 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
                     JSON.parseObject(inspectContentJson, new TypeReference<List<LinkedHashMap<String, Object>>>() {});
             variables.put(FieldCommon.CHECK_LIST, inspectContentList);
         }
-        // 发布企标
+        // 将标准号进行拆分后填充字段
+        String standardNumber = (String) variables.get(FieldCommon.STANDARD_NUMBER);
+        if (StringUtils.isNotBlank(standardNumber)) {
+            Map<String, String> map = EnterpriseStandardUtil.splitStandardNumber(standardNumber);
+            variables.putAll(map);
+            // 如果没有主起草人，则需要填充主起草人
+        }
+        // 主起草人
+        String mainDraftUser = (String) variables.get(FieldCommon.MAIN_DRAFT_USER);
+        if (StringUtils.isBlank(mainDraftUser)) {
+            variables.put(FieldCommon.MAIN_DRAFT_USER, data.getMainDraftUser());
+        }
+        // 标准状态
+        String tryFlag = (String) variables.get(FieldCommon.TRY_FLAG);
+        if (tryFlag.equals(YesOrNoEnum.YES.getValue())) {
+            variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue());
+        } else {
+            variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue());
+        }
         variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
+        // 发布企标
         lawsCommonService.commonAdd(variables);
         String espId = data.getEspId();
         EnterpriseStandardPlan esp = espService.getById(espId);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 8ab03106..94e67b88 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -496,6 +496,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case MAIN_DRAFT_USER_RELEASE:
                 data = revisionData.getData();
+                data.setMainDraftUser(curUserId);
                 saveOrUpdate(data);
                 // TODO 在线编辑 插入签章
                 break;