feat: 新版草稿 封存驳回复审

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")
+    @PostMapping("/saveToDraft")
-    public Result<?> save(@RequestBody ESAbolishDataVO abolishData) {
+    public Result<?> save(@Validated @RequestBody ProcessInfoVO<ESAbolishDataVO> processInfoVO) {
-        abolishService.saveToDraft(abolishData);
+        abolishService.saveToDraft(processInfoVO);
         return Result.OK();
     }
 

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<ProcessEsAbolish> {
 
     void startProcess(ESAbolishDataVO annualInitData);
 
-    void saveToDraft(ESAbolishDataVO annualInitData);
+    void saveToDraft(ProcessInfoVO<ESAbolishDataVO> annualInitData);
 
     ESAbolishDataVO getHandleData(String taskId);
 

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<ProcessEsAbolishMap
     @Resource
     private RuntimeService runtimeService;
 
+    @Resource
+    private IProcessHandleService processHandleService;
+
     @Override
     public void startProcess(ESAbolishDataVO abolishData) {
         // 执行流程发起前的操作
@@ -115,13 +123,20 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
     }
 
     @Override
-    public void saveToDraft(ESAbolishDataVO abolishDataVO) {
+    public void saveToDraft(ProcessInfoVO<ESAbolishDataVO> processInfoVO) {
-        CommonVO commonVO = abolishDataVO.getCommon();
+        ESAbolishDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
-        ProcessEsAbolish esAbolish = abolishDataVO.getData();
+        if (businessInfoDTO != null) {
-        ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH);
+            ProcessEsAbolish data = businessInfoDTO.getData();
-        if (existDraft != null) esAbolish.setId(existDraft.getProjectId());
+            if (data != null) {
-        saveOrUpdate(esAbolish);
+                processInfoVO.setBusinessId(data.getId());
-        actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ABOLISH, esAbolish.getId());
+            }
+        }
+
+        // 流程信息
+        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
+        basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ABOLISH.getValue()); // 流程类型
+
+        processHandleService.saveToDraft(processInfoVO);
     }
 
     public void startRunTask(ESAbolishDataVO abolishData) {

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) {
+    public Result<?> save(@Validated @RequestBody ProcessInfoVO<ESArchiveDataVO> processInfoVO) {
-        archiveService.saveToDraft(archiveData);
+        archiveService.saveToDraft(processInfoVO);
         return Result.OK();
     }
 

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<ProcessEsArchive> {
 
     void startProcess(ESArchiveDataVO annualInitData);
 
-    void saveToDraft(ESArchiveDataVO archiveData);
+    void saveToDraft(ProcessInfoVO<ESArchiveDataVO> processInfoVO);
 
     ESArchiveDataVO getHandleData(String taskId);
 

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<ProcessEsArchiveMap
     @Resource
     private RuntimeService runtimeService;
 
+    @Resource
+    private IProcessHandleService processHandleService;
+
     @Override
     public void startProcess(ESArchiveDataVO archiveData) {
         // 执行流程发起前的操作
@@ -115,13 +123,20 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
     }
 
     @Override
-    public void saveToDraft(ESArchiveDataVO archiveDataVO) {
+    public void saveToDraft(ProcessInfoVO<ESArchiveDataVO> processInfoVO) {
-        CommonVO commonVO = archiveDataVO.getCommon();
+        ESArchiveDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
-        ProcessEsArchive esArchive = archiveDataVO.getData();
+        if (businessInfoDTO != null) {
-        ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ARCHIVE);
+            ProcessEsArchive data = businessInfoDTO.getData();
-        if (existDraft != null) esArchive.setId(existDraft.getProjectId());
+            if (data != null) {
-        saveOrUpdate(esArchive);
+                processInfoVO.setBusinessId(data.getId());
-        actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ARCHIVE, esArchive.getId());
+            }
+        }
+
+        // 流程信息
+        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
+        basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ABOLISH.getValue()); // 流程类型
+
+        processHandleService.saveToDraft(processInfoVO);
     }
 
     public void startRunTask(ESArchiveDataVO archiveData) {

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) {
+    public Result<?> save(@Validated @RequestBody ProcessInfoVO<ESRecheckDataVO> processInfoVO) {
-        recheckService.saveToDraft(recheckData);
+        recheckService.saveToDraft(processInfoVO);
         return Result.OK();
     }
 

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<ProcessEsRecheck> {
 
     void autoStartProcess(ESRecheckDataVO recheckData);
 
-    void saveToDraft(ESRecheckDataVO recheckData);
+    void saveToDraft(ProcessInfoVO<ESRecheckDataVO> recheckData);
 
     ESRecheckDataVO getHandleData(String taskId);
 

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<ProcessEsRecheckMap
     @Resource
     private RuntimeService runtimeService;
 
+    @Resource
+    private IProcessHandleService processHandleService;
+
     @Override
     public void startProcess(ESRecheckDataVO recheckData) {
         // 执行流程发起前的操作
@@ -143,13 +151,20 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     }
 
     @Override
-    public void saveToDraft(ESRecheckDataVO recheckData) {
+    public void saveToDraft(ProcessInfoVO<ESRecheckDataVO> processInfoVO) {
-        CommonVO commonVO = recheckData.getCommon();
+        ESRecheckDataVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
-        ProcessEsRecheck esRecheck = recheckData.getData();
+        if (businessInfoDTO != null) {
-        ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_RECHECK);
+            ProcessEsRecheck data = businessInfoDTO.getData();
-        if (existDraft != null) esRecheck.setId(existDraft.getProjectId());
+            if (data != null) {
-        saveOrUpdate(esRecheck);
+                processInfoVO.setBusinessId(data.getId());
-        actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_RECHECK, esRecheck.getId());
+            }
+        }
+
+        // 流程信息
+        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
+        basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_RECHECK.getValue()); // 流程类型
+
+        processHandleService.saveToDraft(processInfoVO);
     }
 
     public void startRunTask(ESRecheckDataVO recheckData) {