From 27d6444fe3ebbe792b40a9ce0d5938d125fd1440 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 10 Jan 2024 10:46:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BD=AC=E5=8A=9E=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ESRecheckController.java | 2 +- .../entity/RecheckTaskNameConstant.java | 15 ++++++++++ .../service/ProcessEsRecheckService.java | 1 + .../impl/ProcessEsRecheckServiceImpl.java | 30 +++++++++++++++++-- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/RecheckTaskNameConstant.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java index 14ac9265..5e558a72 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java @@ -134,7 +134,7 @@ public class ESRecheckController { @ApiOperation(value="企标复审流程-转办", notes="企标复审流程-转办") @PostMapping(value = "/transfer") public Result transfer(@RequestBody TransferVO transferVO) { - processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + recheckService.transfer(transferVO.getTaskId(), transferVO.getUserId()); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/RecheckTaskNameConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/RecheckTaskNameConstant.java new file mode 100644 index 00000000..786a067a --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/RecheckTaskNameConstant.java @@ -0,0 +1,15 @@ +package com.jero.modules.activiti.process.esRecheck.entity; + +/** + * @author: Mzaxd + * @Date: 2024/1/10 10:28 + */ +public class RecheckTaskNameConstant { + + public static final String STANDARD_ENGINEER_INIT = "标准化发起"; + public static final String CONTACT_USER_DISTRIBUTE = "联络人下发"; + public static final String DRAFTER_EDIT = "起草人填写意见"; + public static final String DRAFTER_LEADER_APPROVAL = "起草人部长审批"; + public static final String STANDARDIZATION_APPROVAL = "标准化审批"; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java index 01dc5e12..64e645cb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java @@ -22,4 +22,5 @@ public interface ProcessEsRecheckService extends IService { void approval(ESRecheckDataVO recheckData, boolean pass); + void transfer(String taskId, String userId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index 5e5408f4..1de31c5e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -8,11 +8,8 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; 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.esAbolish.entity.ProcessEsAbolish; -import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; 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; @@ -24,13 +21,18 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; + +import static com.jero.modules.activiti.process.esRecheck.entity.RecheckTaskNameConstant.*; + /** * @author ThinkBook * @description 针对表【process_es_recheck(企业标准)】的数据库操作Service实现 @@ -54,6 +56,9 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl