From 44b5656a51fdd5278e7f18d84dc6d99e242f1b0f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jan 2024 18:08:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=81=E6=A0=87=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=98=AF=E5=BA=9F=E6=AD=A2=E5=92=8C=E5=B0=81=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/api/vo/ResultCommon.java  |  5 +++++
 .../impl/ProcessEsChangeServiceImpl.java      | 20 ++++++++++++++++++-
 .../main/resources/i18n/messages.properties   |  3 ++-
 .../resources/i18n/messages_en.properties     |  3 ++-
 .../resources/i18n/messages_zh.properties     |  3 ++-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java
index 2df40841..95ee99ff 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java
@@ -137,6 +137,11 @@ public class ResultCommon {
      */
     public static final String INVALID_ESP = "invalid.esp";
 
+    /**
+     * 不可以编辑废止或封存状态的企标
+     */
+    public static final String CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES = "can.not.edit.abolish.or.archive.es";
+
 //    ---------项目合规评估流程---------
     /**
      * 模块负责人不能为空
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
index 8aebe308..e09d824a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -24,6 +25,8 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.sys.utils.UserUtils;
 import com.jero.modules.system.service.ISysUserDepartService;
 import lombok.extern.slf4j.Slf4j;
@@ -69,6 +72,9 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
     @Resource
     private TaskService taskService;
 
+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
     @Override
     public void startProcess(ESChangeDataVO changeData) {
         // 执行流程发起前的操作
@@ -163,7 +169,19 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
     }
 
     public void startRunTask(ESChangeDataVO changeData) {
-        // do nothing now
+        // 如果标准当前状态是废止或封存，不能发起变更流程
+        ProcessEsChange data = changeData.getData();
+        if (data != null) {
+            String standardId = data.getStandardId();
+            LawsEnterpriseStandard es = esService.getById(standardId);
+            if (es != null) {
+                String standardState = es.getStandardState();
+                if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState) ||
+                        StandardStateEnum.ARCHIVE.getStateValue().equals(standardState)) {
+                    throw new JeroBootException(ResultCommon.CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES);
+                }
+            }
+        }
     }
 
     @Override
diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties
index 0232389b..0e6ede99 100644
--- a/laws-single-startup/src/main/resources/i18n/messages.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages.properties
@@ -67,4 +67,5 @@ draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728
 en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7
 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
-invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
\ No newline at end of file
+invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
+can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9
\ No newline at end of file
diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties
index b45df36d..fa79f13e 100644
--- a/laws-single-startup/src/main/resources/i18n/messages_en.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties
@@ -72,4 +72,5 @@ draft.not.exists=Draft not exists
 en.standard.number.conflict=standard number exists
 tag.add.error.2=each table can have a maximum of 50 fields.
 task.urging.error=Can only remind to do tasks
-invalid.esp=Invalid enterprise standard, please check
\ No newline at end of file
+invalid.esp=Invalid enterprise standard, please check
+can.not.edit.abolish.or.archive.es=Can not edit abolished or archived enterprise standards, please check
\ No newline at end of file
diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties
index 8a157e26..a60a15cf 100644
--- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties
+++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties
@@ -72,4 +72,5 @@ draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728
 en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7
 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
-invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
\ No newline at end of file
+invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
+can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9
\ No newline at end of file