feat: 5个流程草稿

laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java

@@ -111,4 +111,20 @@ public class ResultCommon {
     /**请输入检索内容*/
     public static final String PLEASE_SEARCH_TO_IMPORT = "please.search.to.import";
 
+    /**
+     * 任务不存在
+     */
+    public static final String TASK_NOT_EXISTS = "task.not.exists";
+
+    /**
+     * 草稿不存在
+     */
+    public static final String DRAFT_NOT_EXISTS = "draft.not.exists";
+
+    /**
+     * 企标编号冲突，请重新生成
+     */
+    public static final String EN_STANDARD_NUMBER_CONFLICT = "en.standard.number.conflict";
+
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java

@@ -351,7 +351,7 @@ public class ActFlowCommonService {
     public ProcessDraft getExistDraft(String draftId, String businessId, ProcessTypeEnum processTypeEnum) {
         String userId = UserUtils.getUserId();
         LambdaQueryWrapper<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
-        draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue());
+        draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
         draftWrapper.eq(ProcessDraft::getUserId, userId);
         draftWrapper.eq(ProcessDraft::getId, draftId);
         draftWrapper.eq(ProcessDraft::getProjectId, businessId);

laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java

@@ -2,28 +2,20 @@ package com.jero.modules.activiti.process.esAbolish.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 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.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
 import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
 import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
 import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper;
-import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
-import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
-import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
-import com.jero.modules.activiti.service.ProcessNodeService;
-import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -45,21 +37,12 @@ import java.util.*;
 public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMapper, ProcessEsAbolish>
         implements ProcessEsAbolishService {
 
-    @Resource
-    private ProcessAllService processAllService;
-
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
-    @Resource
-    private ProcessDraftService processDraftService;
-
     @Resource
     private ProcessNodeLinkService processNodeLinkService;
 
-    @Resource
-    private ProcessNodeService processNodeService;
-
     @Resource
     private RuntimeService runtimeService;
 
@@ -147,7 +130,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
     @Override
     public ESAbolishDataVO getHandleData(String taskId) {
         if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         ESAbolishDataVO abolishData = new ESAbolishDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
@@ -168,7 +151,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         CommonVO commonVO = abolishData.getCommon();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("taskId为空或任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         // 设置流程变量
@@ -183,8 +166,10 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
 
     @Override
     public ESAbolishDataVO getDraftData(String draftId, String businessId) {
-        ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_ARCHIVE);
+        ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_ABOLISH);
-        if (draft != null) {
+        if (draft == null) {
+            throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
+        } else {
             ESAbolishDataVO abolishDataVO = new ESAbolishDataVO();
             // 获取流程通用数据
             CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
@@ -197,7 +182,6 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
             abolishDataVO.setData(data);
             return abolishDataVO;
         }
-        return null;
     }
 }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java

@@ -2,27 +2,20 @@ package com.jero.modules.activiti.process.esArchive.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 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.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
 import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService;
 import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper;
-import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
-import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
-import com.jero.modules.activiti.service.ProcessNodeService;
-import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -44,21 +37,12 @@ import java.util.*;
 public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMapper, ProcessEsArchive>
     implements ProcessEsArchiveService{
 
-    @Resource
-    private ProcessAllService processAllService;
-
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
-    @Resource
-    private ProcessDraftService processDraftService;
-
     @Resource
     private ProcessNodeLinkService processNodeLinkService;
 
-    @Resource
-    private ProcessNodeService processNodeService;
-
     @Resource
     private RuntimeService runtimeService;
 
@@ -146,7 +130,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
     @Override
     public ESArchiveDataVO getHandleData(String taskId) {
         if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         ESArchiveDataVO archiveData = new ESArchiveDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
@@ -167,7 +151,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         CommonVO commonVO = abolishData.getCommon();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("taskId为空或任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         // 设置流程变量
@@ -183,7 +167,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
     @Override
     public ESArchiveDataVO getDraftData(String draftId, String businessId) {
         ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_ARCHIVE);
-        if (draft != null) {
+        if (draft == null) {
+            throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
+        } else {
             ESArchiveDataVO archiveDataVO = new ESArchiveDataVO();
             // 获取流程通用数据
             CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
@@ -196,7 +182,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
             archiveDataVO.setData(data);
             return archiveDataVO;
         }
-        return null;
     }
 }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esEnable.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
@@ -10,12 +11,10 @@ import com.jero.modules.activiti.process.common.entity.CommonVO;
 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.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable;
 import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO;
 import com.jero.modules.activiti.process.esEnable.service.ProcessEsEnableService;
 import com.jero.modules.activiti.process.esEnable.mapper.ProcessEsEnableMapper;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -38,15 +37,9 @@ import java.util.*;
 public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMapper, ProcessEsEnable>
     implements ProcessEsEnableService{
 
-    @Resource
-    private ProcessAllService processAllService;
-
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
-    @Resource
-    private ProcessDraftService processDraftService;
-
     @Resource
     private ProcessNodeLinkService processNodeLinkService;
 
@@ -124,7 +117,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
     public void saveToDraft(ESEnableDataVO enableDataVO) {
         CommonVO commonVO = enableDataVO.getCommon();
         ProcessEsEnable esEnable = enableDataVO.getData();
-        ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ARCHIVE);
+        ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ENABLE);
         if (existDraft != null) esEnable.setId(existDraft.getProjectId());
         saveOrUpdate(esEnable);
         actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ENABLE, esEnable.getId());
@@ -137,7 +130,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
     @Override
     public ESEnableDataVO getHandleData(String taskId) {
         if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         ESEnableDataVO enableData = new ESEnableDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
@@ -158,7 +151,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         CommonVO commonVO = enableData.getCommon();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("taskId为空或任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         // 设置流程变量
@@ -174,7 +167,9 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
     @Override
     public ESEnableDataVO getDraftData(String draftId, String projectId) {
         ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, projectId, ProcessTypeEnum.ES_ENABLE);
-        if (draft != null) {
+        if (draft == null) {
+            throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
+        } else {
             ESEnableDataVO enableDataVO = new ESEnableDataVO();
             // 获取流程通用数据
             CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
@@ -187,7 +182,6 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
             enableDataVO.setData(data);
             return enableDataVO;
         }
-        return null;
     }
 }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -4,21 +4,19 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 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.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
 import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
@@ -44,9 +42,6 @@ import java.util.stream.Collectors;
 public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitChangeMapper, ProcessEsInitChange>
         implements ProcessEsInitChangeService, ESSequenceNumberProvider {
 
-    @Resource
-    private ProcessAllService processAllService;
-
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
@@ -133,7 +128,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Override
     public InitChangeDataVO getHandleData(String taskId) {
         if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         InitChangeDataVO initChangeDataVO = new InitChangeDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
@@ -151,7 +146,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Override
     public InitChangeDataVO getDraftData(String draftId, String businessId) {
         ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_INIT_CHANGE);
-        if (draft != null) {
+        if (draft == null) {
+            throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
+        } else{
             InitChangeDataVO initChangeDataVO = new InitChangeDataVO();
             // 获取流程通用数据
             CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
@@ -164,7 +161,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
             initChangeDataVO.setDataList(dataList);
             return initChangeDataVO;
         }
-        return null;
     }
 
     @Override
@@ -175,7 +171,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         Map<String, Object> flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("taskId为空或任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
@@ -232,7 +228,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         ProcessEsInitChange initChange = esInitChangeList.get(0);
         if (initChange.getProjectType().equals(ESPProjectType.ENACT.getValue())) {
             if (!esUtil.verifyEnStandardNumber(initChange.getNewEnStandardNo())) {
-                throw new JeroBootException("企标编号冲突，请重新生成");
+                throw new JeroBootException(ResultCommon.EN_STANDARD_NUMBER_CONFLICT);
             }
         }
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java

@@ -2,28 +2,20 @@ package com.jero.modules.activiti.process.esRecheck.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 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.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.common.service.ProcessDraftService;
-
-import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
-import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
-import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
 import com.jero.modules.activiti.process.esRecheck.mapper.ProcessEsRecheckMapper;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
-import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -45,15 +37,9 @@ import java.util.*;
 public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMapper, ProcessEsRecheck>
     implements ProcessEsRecheckService{
 
-    @Resource
-    private ProcessAllService processAllService;
-
     @Resource
     private ActFlowCommonService actFlowCommonService;
 
-    @Resource
-    private ProcessDraftService processDraftService;
-
     @Resource
     private ProcessNodeLinkService processNodeLinkService;
 
@@ -132,7 +118,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     @Override
     public ESRecheckDataVO getHandleData(String taskId) {
         if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         ESRecheckDataVO recheckData = new ESRecheckDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
@@ -153,7 +139,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         CommonVO commonVO = recheckData.getCommon();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("taskId为空或任务不存在");
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         if (pass) {
@@ -172,7 +158,9 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     @Override
     public ESRecheckDataVO getDraftData(String draftId, String businessId) {
         ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_RECHECK);
-        if (draft != null) {
+        if (draft == null) {
+            throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
+        } else {
             ESRecheckDataVO recheckDataVO = new ESRecheckDataVO();
             // 获取流程通用数据
             CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
@@ -185,7 +173,6 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
             recheckDataVO.setData(data);
             return recheckDataVO;
         }
-        return null;
     }
 }
 

laws-single-startup/src/main/resources/i18n/messages.properties

@@ -61,3 +61,6 @@ the.real.name.and.job.number.mismatch.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0E\
 tag.delete.error.3=\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
 tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539
 please.search.to.import=\u8BF7\u8F93\u5165\u68C0\u7D22\u5185\u5BB9
+task.not.exists=\u4EFB\u52A1\u4E0D\u5B58\u5728
+draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728
+en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210

laws-single-startup/src/main/resources/i18n/messages_en.properties

@@ -66,3 +66,6 @@ the.real.name.and.job.number.mismatch.export=Line {0},real name and job number m
 tag.delete.error.3=It contains fixed fields and cannot be deleted.
 tag.edit.error.1=Fixed field, which cannot be modified.
 please.search.to.import=please search to import
+task.not.exists=Task not exists
+draft.not.exists=Draft not exists
+en.standard.number.conflict=English standard number conflict

laws-single-startup/src/main/resources/i18n/messages_zh.properties

@@ -66,3 +66,6 @@ the.real.name.and.job.number.mismatch.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0E\
 tag.delete.error.3=\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
 tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539
 please.search.to.import=\u8BF7\u8F93\u5165\u68C0\u7D22\u5185\u5BB9
+task.not.exists=\u4EFB\u52A1\u4E0D\u5B58\u5728
+draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728
+en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210