From 2bd44b269e477df9301b1ba5845d7af68638631b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 23 Nov 2023 10:11:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=205=E4=B8=AA=E6=B5=81=E7=A8=8B=E8=8D=89?= =?UTF-8?q?=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/api/vo/ResultCommon.java | 16 ++++++++++ .../common/service/ActFlowCommonService.java | 2 +- .../impl/ProcessEsAbolishServiceImpl.java | 30 +++++-------------- .../impl/ProcessEsArchiveServiceImpl.java | 27 ++++------------- .../impl/ProcessEsEnableServiceImpl.java | 20 +++++-------- .../impl/ProcessEsInitChangeServiceImpl.java | 18 +++++------ .../impl/ProcessEsRecheckServiceImpl.java | 25 ++++------------ .../main/resources/i18n/messages.properties | 3 ++ .../resources/i18n/messages_en.properties | 3 ++ .../resources/i18n/messages_zh.properties | 3 ++ 10 files changed, 59 insertions(+), 88 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 00213fc0..2b9b0b86 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 @@ -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"; + + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 3a5f1d35..4abed08b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/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 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); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index 32cf38c7..c0986799 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/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 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 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 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 implements ProcessEsInitChangeService, ESSequenceNumberProvider { - @Resource - private ProcessAllService processAllService; - @Resource private ActFlowCommonService actFlowCommonService; @@ -133,7 +128,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl 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 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