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 b844cd89..b5094d6e 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 @@ -346,7 +346,7 @@ public class ActFlowCommonService { return UUID.randomUUID().toString().replace("-", ""); } - public ProcessDraft getExistDraft(String draftId, String businessId, ProcessTypeEnum processTypeEnum) { + public ProcessDraft getExistDraft(String draftId, ProcessTypeEnum processTypeEnum) { String userId = UserUtils.getUserId(); LambdaQueryWrapper draftWrapper = new LambdaQueryWrapper<>(); draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue()); 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 5dab80aa..7a5d9369 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 @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAbolish.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.enums.ProcessTypeEnum; 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; @@ -36,6 +37,10 @@ public class ESAbolishController { @Resource private IProcessHandleService processHandleService; + + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 新增立项变更申请 * @@ -64,15 +69,13 @@ public class ESAbolishController { /** * 草稿办理 * @param draftId - * @param projectId */ @AutoLog(value = "企标废止发起流程-草稿办理") @ApiOperation(value="企标废止发起流程-草稿办理", notes="企标废止发起流程-草稿办理") @GetMapping("/draftHandle") @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, - @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { - return Result.OK(abolishService.getDraftData(draftId, projectId)); + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_ABOLISH)); } 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 82baab9f..9b4f49a5 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 @@ -20,5 +20,4 @@ public interface ProcessEsAbolishService extends IService { void approval(ESAbolishDataVO annualInitData, boolean pass); - ESAbolishDataVO getDraftData(String draftId, String projectId); } 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 27649971..af2b16be 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 @@ -184,25 +184,6 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProcessEsAbolish::getId, businessId); - lambdaQueryWrapper.eq(ProcessEsAbolish::getDelFlag, YesOrNoEnum.NO.getValue()); - ProcessEsAbolish data = getOne(lambdaQueryWrapper); - abolishDataVO.setData(data); - return abolishDataVO; - } - } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java index b4d818d3..1878ddc3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java @@ -7,16 +7,21 @@ import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.aspect.annotation.Translation; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.util.MessageUtils; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.TransferVO; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO; import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.IOUtils; import org.springframework.core.io.ClassPathResource; import org.springframework.http.HttpHeaders; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -44,6 +49,9 @@ public class ESAnnualInitController { @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 新增立项变更申请 * @@ -59,18 +67,30 @@ public class ESAnnualInitController { /** * 保存到待办 - * @param annualInitData + * @param processInfoVO */ @AutoLog(value = "企标年度制修订标准化发起流程-保存") @ApiOperation(value="企标年度制修订标准化发起流程-保存", notes="企标年度制修订标准化发起流程-保存") @PostMapping("/save") - public Result save(@RequestBody AnnualInitDataVO annualInitData) { - annualInitService.saveToDraft(annualInitData); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + annualInitService.saveToDraft(processInfoVO); return Result.OK(); } /** - * 保存到待办 + * 草稿办理 + * @param draftId + */ + @AutoLog(value = "企标封存流程-草稿办理") + @ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_ANNUAL_INIT)); + } + + /** + * 待办回显 * @param taskId */ @AutoLog(value = "企标年度制修订标准化发起流程-办理") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java index 76f8ed2d..d51b99fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAnnualInit.service; import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import org.springframework.web.multipart.MultipartFile; import java.util.Map; @@ -22,7 +23,7 @@ public interface ProcessEsAnnualInitService extends IService annualInitData); AnnualInitDataVO getHandleData(String taskId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index b4207375..c5cb14fc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -18,7 +18,12 @@ import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitFlowUserVO; import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService; import com.jero.modules.activiti.process.esAnnualInit.mapper.ProcessEsAnnualInitMapper; +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.enums.ESPProjectType; +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.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeService; @@ -41,7 +46,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; @@ -89,6 +93,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl processInfoVO) { + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ANNUAL_INIT.getValue()); // 流程类型 + processHandleService.saveToDraft(processInfoVO); } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java index 60310b19..76697e27 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java @@ -7,12 +7,15 @@ import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.aspect.annotation.Translation; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.util.MessageUtils; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDataVO; import com.jero.modules.activiti.process.esAnnualReport.service.ProcessEsAnnualReportService; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; 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; @@ -20,6 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.IOUtils; import org.springframework.core.io.ClassPathResource; import org.springframework.http.HttpHeaders; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -48,6 +52,9 @@ public class ESAnnualReportController { @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 导入模板下载 */ @@ -107,13 +114,13 @@ public class ESAnnualReportController { /** * 保存到待办 - * @param annualReportDataVO + * @param processInfoVO */ @AutoLog(value = "企标立项变更流程-保存") @ApiOperation(value="企标立项变更流程-保存", notes="企标立项变更流程-保存") @PostMapping("/save") - public Result save(@RequestBody AnnualReportDataVO annualReportDataVO) { - annualReportService.saveToDraft(annualReportDataVO); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + annualReportService.saveToDraft(processInfoVO); return Result.OK(); } @@ -166,4 +173,16 @@ public class ESAnnualReportController { processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); return Result.OK(); } + + /** + * 草稿办理 + * @param draftId + */ + @AutoLog(value = "企标年度制修订主动上报流程-草稿办理") + @ApiOperation(value="企标年度制修订主动上报流程-草稿办理", notes="企标年度制修订主动上报流程-草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_ANNUAL_REPORT)); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/ProcessEsAnnualReportService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/ProcessEsAnnualReportService.java index 43d9edad..3a23eb17 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/ProcessEsAnnualReportService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/ProcessEsAnnualReportService.java @@ -3,9 +3,9 @@ package com.jero.modules.activiti.process.esAnnualReport.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import org.springframework.web.multipart.MultipartFile; -import java.util.List; import java.util.Map; /** @@ -21,7 +21,7 @@ public interface ProcessEsAnnualReportService extends IService annualReportDataVO); AnnualReportDataVO getHandleData(String taskId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index eb3461d4..929e9c45 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -17,13 +17,13 @@ import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDa import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper; import com.jero.modules.activiti.process.esAnnualReport.service.ProcessEsAnnualReportService; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType; +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.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; -import com.jero.modules.activiti.service.ProcessNodeService; import com.jero.modules.activiti.util.ExcelUtils; -import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.util.ImportUtil; -import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.sys.utils.UserUtils; @@ -34,14 +34,12 @@ import org.activiti.engine.TaskService; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; @@ -85,6 +83,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl processInfoVO) { + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ANNUAL_REPORT.getValue()); // 流程类型 + processHandleService.saveToDraft(processInfoVO); } @Override 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 1016e063..d35d4d03 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 @@ -85,7 +85,7 @@ public class ESArchiveController { @GetMapping("/draftHandle") @Translation public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { - return Result.OK(actFlowCommonService.getExistDraft(draftId, null, ProcessTypeEnum.ES_ARCHIVE)); + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_ARCHIVE)); } /** 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 97f24f99..3e620f1b 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 @@ -20,5 +20,4 @@ public interface ProcessEsArchiveService extends IService { void approval(ESArchiveDataVO archiveData, boolean pass); - ESArchiveDataVO getDraftData(String draftId, String projectId); } 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 fff119c9..f0e579a5 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 @@ -183,26 +183,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProcessEsArchive::getId, businessId); - lambdaQueryWrapper.eq(ProcessEsArchive::getDelFlag, YesOrNoEnum.NO.getValue()); - ProcessEsArchive data = getOne(lambdaQueryWrapper); - archiveDataVO.setData(data); - return archiveDataVO; - } - } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java index cbe4d3e7..66c8f9ee 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java @@ -3,15 +3,19 @@ package com.jero.modules.activiti.process.esChange.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; import com.jero.modules.activiti.process.esChange.service.ProcessEsChangeService; 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; @@ -32,6 +36,10 @@ public class ESChangeController { @Resource private IProcessHandleService processHandleService; + + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 新增企标更改流程 * @@ -47,13 +55,13 @@ public class ESChangeController { /** * 保存到待办 - * @param changeData + * @param processInfoVO */ @AutoLog(value = "企标更改流程-保存") @ApiOperation(value="企标更改流程-保存", notes="企标更改流程-保存") @PostMapping("/save") - public Result save(@RequestBody ESChangeDataVO changeData) { - changeService.saveToDraft(changeData); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + changeService.saveToDraft(processInfoVO); return Result.OK(); } @@ -116,9 +124,8 @@ public class ESChangeController { @ApiOperation(value="企标更改流程-草稿办理", notes="企标更改流程-草稿办理") @GetMapping("/draftHandle") @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, - @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { - return Result.OK(changeService.getDraftData(draftId, projectId)); + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_CHANGE)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java index fb89b4c6..1d8c14bc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java @@ -1,9 +1,9 @@ package com.jero.modules.activiti.process.esChange.service; -import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esChange.entity.ProcessEsChange; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @author ThinkBook @@ -14,12 +14,10 @@ public interface ProcessEsChangeService extends IService { void startProcess(ESChangeDataVO changeData); - void saveToDraft(ESChangeDataVO changeData); + void saveToDraft(ProcessInfoVO changeData); ESChangeDataVO getHandleData(String taskId); void approval(ESChangeDataVO changeData, boolean pass); - ESChangeDataVO getDraftData(String draftId, String projectId); - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java index aa0d491b..3072121d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java @@ -2,30 +2,29 @@ package com.jero.modules.activiti.process.esChange.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.CounterSignNodeNameConstants; 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.esChange.entity.EsChangeOpinion; import com.jero.modules.activiti.process.esChange.entity.ProcessEsChange; import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO; import com.jero.modules.activiti.process.esChange.service.EsChangeOpinionService; import com.jero.modules.activiti.process.esChange.service.ProcessEsChangeService; import com.jero.modules.activiti.process.esChange.mapper.ProcessEsChangeMapper; -import com.jero.modules.activiti.service.ProcessAllService; +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.activiti.service.ProcessNodeService; import com.jero.modules.sys.utils.UserUtils; -import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.service.ISysUserDepartService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -35,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; -import java.util.stream.Collectors; /** * @author ThinkBook @@ -63,6 +61,11 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl opinionList = esChange.getList(); - ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_CHANGE); - if (existDraft != null) esChange.setId(existDraft.getProjectId()); - saveOrUpdate(esChange); - if (opinionList != null && !opinionList.isEmpty()) { - String deptId = userDepartService.getFirstDeptIdByUserId(userId); - // 遍历 opinionList，设置 opinion 的 BusinessId - opinionList.forEach(opinion -> { - opinion.setBusinessId(esChange.getId()); - if (StrUtil.isBlank(opinion.getCreateUser())) opinion.setCreateUser(userId); - if (StrUtil.isBlank(opinion.getCreateUnit())) opinion.setCreateUnit(deptId); - }); - esChangeOpinionService.saveOrUpdateBatch(opinionList); + public void saveToDraft(ProcessInfoVO processInfoVO) { + ESChangeDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + if (businessInfoDTO != null) { + ProcessEsChange data = businessInfoDTO.getData(); + if (data != null) { + processInfoVO.setBusinessId(data.getId()); + } } - actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_CHANGE, esChange.getId()); + + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_CHANGE.getValue()); // 流程类型 + + processHandleService.saveToDraft(processInfoVO); } public void startRunTask(ESChangeDataVO changeData) { @@ -208,29 +206,6 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProcessEsChange::getId, businessId); - lambdaQueryWrapper.eq(ProcessEsChange::getDelFlag, YesOrNoEnum.NO.getValue()); - ProcessEsChange data = getOne(lambdaQueryWrapper); - LambdaQueryWrapper opinionLambdaQueryWrapper = new LambdaQueryWrapper<>(); - opinionLambdaQueryWrapper.eq(EsChangeOpinion::getBusinessId, data.getId()); - List opinionList = esChangeOpinionService.list(opinionLambdaQueryWrapper); - data.setList(opinionList); - changeDataVO.setData(data); - return changeDataVO; - } - } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java index 07f0f61e..1cf5a892 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java @@ -3,15 +3,19 @@ package com.jero.modules.activiti.process.esEnable.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; 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.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; @@ -33,6 +37,9 @@ public class ESEnableController { @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 新增立项变更申请 * @@ -53,23 +60,21 @@ public class ESEnableController { @AutoLog(value = "企标启用发起流程-保存") @ApiOperation(value="企标启用发起流程-保存", notes="企标启用发起流程-保存") @PostMapping("/save") - public Result save(@RequestBody ESEnableDataVO enableData) { - enableService.saveToDraft(enableData); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + enableService.saveToDraft(processInfoVO); return Result.OK(); } /** * 草稿办理 * @param draftId - * @param projectId */ @AutoLog(value = "企标封存流程-草稿办理") @ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理") @GetMapping("/draftHandle") @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, - @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { - return Result.OK(enableService.getDraftData(draftId, projectId)); + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_ENABLE)); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java index 8e0bcb40..fb0fc3bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esEnable.service; import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @author ThinkBook @@ -13,11 +14,10 @@ public interface ProcessEsEnableService extends IService { void startProcess(ESEnableDataVO enableData); - void saveToDraft(ESEnableDataVO enableData); + void saveToDraft(ProcessInfoVO enableData); ESEnableDataVO getHandleData(String taskId); void approval(ESEnableDataVO enableData, boolean pass); - ESEnableDataVO getDraftData(String draftId, String projectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index ccae4199..6bfb9d2e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.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.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.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.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 ProcessEsEnableServiceImpl extends ServiceImpl processInfoVO) { + ESEnableDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + if (businessInfoDTO != null) { + ProcessEsEnable data = businessInfoDTO.getData(); + if (data != null) { + processInfoVO.setBusinessId(data.getId()); + } + } + + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ENABLE.getValue()); // 流程类型 + + processHandleService.saveToDraft(processInfoVO); } public void startRunTask(ESEnableDataVO enableData) { @@ -169,25 +184,6 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProcessEsEnable::getId, projectId); - lambdaQueryWrapper.eq(ProcessEsEnable::getDelFlag, YesOrNoEnum.NO.getValue()); - ProcessEsEnable data = getOne(lambdaQueryWrapper); - enableDataVO.setData(data); - return enableDataVO; - } - } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index 1c531224..e5356a15 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java @@ -3,12 +3,15 @@ package com.jero.modules.activiti.process.esInitChange.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +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.esInitChange.entity.vo.InitChangeDataVO; import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; @@ -17,6 +20,7 @@ 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; import java.util.HashMap; @@ -44,6 +48,9 @@ public class ProcessESInitChangeController { @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 新增立项变更申请 * @@ -76,13 +83,13 @@ public class ProcessESInitChangeController { /** * 保存到待办 - * @param initChangeDataVO + * @param processInfoVO */ @AutoLog(value = "企标立项变更流程-保存") @ApiOperation(value="企标立项变更流程-保存", notes="企标立项变更流程-保存") @PostMapping("/save") - public Result save(@RequestBody InitChangeDataVO initChangeDataVO) { - initChangeService.saveToDraft(initChangeDataVO); + public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { + initChangeService.saveToDraft(processInfoVO); return Result.OK(); } @@ -107,9 +114,8 @@ public class ProcessESInitChangeController { @ApiOperation(value="企标立项变更流程-草稿办理", notes="企标立项变更流程-草稿办理") @GetMapping("/draftHandle") @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, - @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { - return Result.OK(initChangeService.getDraftData(draftId, projectId)); + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_INIT_CHANGE)); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java index 9f864819..89e7d39b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java @@ -3,9 +3,7 @@ package com.jero.modules.activiti.process.esInitChange.service; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO; -import org.activiti.engine.runtime.ProcessInstance; - -import java.util.List; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @author ThinkBook @@ -33,7 +31,7 @@ public interface ProcessEsInitChangeService extends IService initChangeData); /** * 软删除实例数据 @@ -48,12 +46,6 @@ public interface ProcessEsInitChangeService extends IService lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProcessEsInitChange::getBusinessId, businessId); - lambdaQueryWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue()); - List dataList = list(lambdaQueryWrapper); - initChangeDataVO.setDataList(dataList); - return initChangeDataVO; - } - } - @Override public void autoStartProcessByRecheck(String standardNo) { // 1. 根据企标编号找到对应企标的主起草人 @@ -272,27 +259,12 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl dataList = initChangeData.getDataList(); + public void saveToDraft(ProcessInfoVO processInfoVO) { + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_INIT_CHANGE.getValue()); // 流程类型 - // 先删后增 - // 先找到原来的businessId - ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_INIT_CHANGE); - if (existDraft != null) { - // 根据原来的businessId删除业务主表数据 - String businessId = existDraft.getProjectId(); - LambdaQueryWrapper qWrapper = new LambdaQueryWrapper<>(); - qWrapper.eq(ProcessEsInitChange::getBusinessId, businessId); - remove(qWrapper); - } - // 生成唯一的businessId - String newBusinessId = actFlowCommonService.getNewBusinessId(); - // 新增业务表数据 - dataList.forEach(e -> e.setBusinessId(newBusinessId)); - saveOrUpdateBatch(dataList); - // 新增草稿表数据 - actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, newBusinessId); + processHandleService.saveToDraft(processInfoVO); } public void startRunTask(InitChangeDataVO initChangeData) { 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 093e1d2a..a157518b 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 @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esRecheck.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.enums.ProcessTypeEnum; 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; @@ -36,6 +37,9 @@ public class ESRecheckController { @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 企标复审申请 * @@ -76,15 +80,13 @@ public class ESRecheckController { /** * 草稿办理 * @param draftId - * @param projectId */ @AutoLog(value = "企标复审流程-草稿办理") @ApiOperation(value="企标复审流程-草稿办理", notes="企标复审流程-草稿办理") @GetMapping("/draftHandle") @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, - @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { - return Result.OK(recheckService.getDraftData(draftId, projectId)); + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_RECHECK)); } /** 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 ff76a940..01dc5e12 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,6 +22,4 @@ public interface ProcessEsRecheckService extends IService { void approval(ESRecheckDataVO recheckData, boolean pass); - ESRecheckDataVO getDraftData(String draftId, String projectId); - } 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 d8e69216..057663d3 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 @@ -235,25 +235,6 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProcessEsRecheck::getId, businessId); - lambdaQueryWrapper.eq(ProcessEsRecheck::getDelFlag, YesOrNoEnum.NO.getValue()); - ProcessEsRecheck data = getOne(lambdaQueryWrapper); - recheckDataVO.setData(data); - return recheckDataVO; - } - } }