From 5dd2159c9e9ddba95c707c765e42f74f5a62af9c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 25 Sep 2024 17:10:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/annualinit/service/ProcessAnnualInitService.java   | 3 ++-
 .../modules/activiti/process/common/enums/ProcessType.java     | 3 ++-
 .../activiti/process/fb/common/ProcessDefinitionKey.java       | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java
index c15f7221..e4c458be 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java
@@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink
 import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitMapper;
 import com.jero.modules.activiti.process.annualinit.vo.ProcessAnnualInitVO;
 import com.jero.modules.activiti.process.common.common.DraftCommon;
+import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
@@ -66,7 +67,7 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
 
         //启动流程
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
-        basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.ANNUAL_INIT)); // 流程定义id
+        basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessType.ANNUAL_INIT.getProcessKey())); // 流程定义id
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ANNUAL_INIT.getValue()); // 流程类型
         userInfoMap.put(ProcessAnnualInitCommon.MAIN_DRAFTING_USER, CurrentUserUtil.getId());
         processInfoVO.setUserInfoMap(userInfoMap);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java
index f186fb35..a58bf81e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java
@@ -16,7 +16,8 @@ public enum ProcessType {
     STANDARD_COMPLIANCE_CHECK("法规符合性评估流程", "3", "laws-evaluation-main", "ProcessStandardComplianceCheckServiceImpl"),
     MARKET_STANDARD_PUBLISH("市场清单发布流程", "4", "market_standard_publish", "ProcessNewStandardImportServiceImpl"),
     ENTERPRISE_STANDARD_ABOLISH_PUBLISH("企标废止发布流程", "5", "enterprise_standard_abolish_publish", "ProcessAbolishReleaseServiceImpl"),
-    ES_REVISION_ADVICE("企标制修订及征求意见流程", "6", "es_revision_advice", "ProcessEsRevisionServiceImpl")
+    ES_REVISION_ADVICE("企标制修订及征求意见流程", "6", "es_revision_advice", "ProcessEsRevisionServiceImpl"),
+    ANNUAL_INIT("年度制修订计划流程", "7", "process-annual-init", "ProcessAnnualInitService")
     ;
 
     private final String name;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessDefinitionKey.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessDefinitionKey.java
index da63f7b4..9cbc5c55 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessDefinitionKey.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessDefinitionKey.java
@@ -18,7 +18,5 @@ public class ProcessDefinitionKey {
     public static final String STANDARD_COMPLIANCE_CHECK_DISTRIBUTE = "laws-evaluation-distribute";
     // 法规符合性排查流程-重新分发
     public static final String STANDARD_COMPLIANCE_CHECK_REDISTRIBUTE = "laws-evaluation-redistribute";
-    //年度制修订计划流程
-    public static final String ANNUAL_INIT = "annual_init";
 
 }