From 27d7abf3c9ab1379f0ca5f5e93e7ca4e59fbcd50 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Dec 2023 09:33:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E7=89=88=E8=8D=89=E7=A8=BF=20?= =?UTF-8?q?=E5=B0=81=E5=AD=98=E9=A9=B3=E5=9B=9E=E5=A4=8D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ESAbolishController.java | 12 ++++--- .../service/ProcessEsAbolishService.java | 3 +- .../impl/ProcessEsAbolishServiceImpl.java | 31 ++++++++++++++----- .../controller/ESArchiveController.java | 7 +++-- .../service/ProcessEsArchiveService.java | 3 +- .../impl/ProcessEsArchiveServiceImpl.java | 29 ++++++++++++----- .../controller/ESRecheckController.java | 11 ++++--- .../service/ProcessEsRecheckService.java | 3 +- .../impl/ProcessEsRecheckServiceImpl.java | 29 ++++++++++++----- 9 files changed, 93 insertions(+), 35 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java index fce33e8f..5dab80aa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java @@ -5,13 +5,17 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; import com.jero.modules.activiti.process.common.entity.TransferVO; 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.esAbolish.service.ProcessEsAbolishService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -47,13 +51,13 @@ public class ESAbolishController { /** * 保存到草稿 - * @param abolishData + * @param processInfoVO */ @AutoLog(value = "企标废止发起流程-保存") @ApiOperation(value="企标废止发起流程-保存", notes="企标废止发起流程-保存") - @PostMapping("/save") - public Result save(@RequestBody ESAbolishDataVO abolishData) { - abolishService.saveToDraft(abolishData); + @PostMapping("/saveToDraft") + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + abolishService.saveToDraft(processInfoVO); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java index 58e3f3a9..82baab9f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAbolish.service; import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @author ThinkBook @@ -13,7 +14,7 @@ public interface ProcessEsAbolishService extends IService { void startProcess(ESAbolishDataVO annualInitData); - void saveToDraft(ESAbolishDataVO annualInitData); + void saveToDraft(ProcessInfoVO annualInitData); ESAbolishDataVO getHandleData(String taskId); 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 41d421ed..27649971 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 @@ -16,6 +16,11 @@ 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.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.process.projectassess.entity.ProcessProjectAssess; +import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; @@ -47,6 +52,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl setVariables(Map flowUser) { Map actVariables = new HashMap<>(); - if (flowUser.get("relatedUserList") == null || StrUtil.isBlank((String)flowUser.get("relatedUserList"))) { + if (flowUser.get("relatedUserList") == null || StrUtil.isBlank((String) flowUser.get("relatedUserList"))) { actFlowCommonService.putIfNotNull(actVariables, "countersign", false); } else { actFlowCommonService.putIfNotNull(actVariables, "countersign", true); @@ -115,13 +123,20 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl processInfoVO) { + ESAbolishDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + if (businessInfoDTO != null) { + ProcessEsAbolish data = businessInfoDTO.getData(); + if (data != null) { + processInfoVO.setBusinessId(data.getId()); + } + } + + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ABOLISH.getValue()); // 流程类型 + + processHandleService.saveToDraft(processInfoVO); } public void startRunTask(ESAbolishDataVO abolishData) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java index 20cefe7f..98af0ebe 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java @@ -5,13 +5,16 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; 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.fb.service.IProcessHandleService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -53,8 +56,8 @@ public class ESArchiveController { @AutoLog(value = "企标封存流程-保存") @ApiOperation(value="企标封存流程-保存", notes="企标封存流程-保存") @PostMapping("/save") - public Result save(@RequestBody ESArchiveDataVO archiveData) { - archiveService.saveToDraft(archiveData); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + archiveService.saveToDraft(processInfoVO); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java index 161c6ca2..97f24f99 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esArchive.service; import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @author ThinkBook @@ -13,7 +14,7 @@ public interface ProcessEsArchiveService extends IService { void startProcess(ESArchiveDataVO annualInitData); - void saveToDraft(ESArchiveDataVO archiveData); + void saveToDraft(ProcessInfoVO processInfoVO); ESArchiveDataVO getHandleData(String taskId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 38dc4df9..3bc5839c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -12,10 +12,15 @@ import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConsta 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.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.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.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; @@ -47,6 +52,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl processInfoVO) { + ESArchiveDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + if (businessInfoDTO != null) { + ProcessEsArchive data = businessInfoDTO.getData(); + if (data != null) { + processInfoVO.setBusinessId(data.getId()); + } + } + + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ABOLISH.getValue()); // 流程类型 + + processHandleService.saveToDraft(processInfoVO); } public void startRunTask(ESArchiveDataVO archiveData) { 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 c4088607..093e1d2a 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 @@ -5,13 +5,16 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; 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.fb.service.IProcessHandleService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -47,14 +50,14 @@ public class ESRecheckController { } /** - * 保存到待办 - * @param recheckData + * 保存到草稿 + * @param processInfoVO */ @AutoLog(value = "企标复审流程-保存") @ApiOperation(value="企标复审流程-保存", notes="企标复审流程-保存") @PostMapping("/save") - public Result save(@RequestBody ESRecheckDataVO recheckData) { - recheckService.saveToDraft(recheckData); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + recheckService.saveToDraft(processInfoVO); return Result.OK(); } 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 346eab29..ff76a940 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 @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esRecheck.service; import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @author ThinkBook @@ -15,7 +16,7 @@ public interface ProcessEsRecheckService extends IService { void autoStartProcess(ESRecheckDataVO recheckData); - void saveToDraft(ESRecheckDataVO recheckData); + void saveToDraft(ProcessInfoVO recheckData); ESRecheckDataVO getHandleData(String taskId); 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 824e61a7..d8e69216 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 @@ -11,10 +11,15 @@ 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; import com.jero.modules.activiti.process.esRecheck.mapper.ProcessEsRecheckMapper; +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.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; @@ -46,6 +51,9 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl processInfoVO) { + ESRecheckDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + if (businessInfoDTO != null) { + ProcessEsRecheck data = businessInfoDTO.getData(); + if (data != null) { + processInfoVO.setBusinessId(data.getId()); + } + } + + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_RECHECK.getValue()); // 流程类型 + + processHandleService.saveToDraft(processInfoVO); } public void startRunTask(ESRecheckDataVO recheckData) {