ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mzaxd
2023-12-15 09:33:28 +08:00
parent ea596f3cdc
commit 27d7abf3c9
9 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java
+8 -4
View File
@@ -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<ESAbolishDataVO> processInfoVO) {
abolishService.saveToDraft(processInfoVO);
return Result.OK();
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java
+2 -1
View File
@@ -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
+23 -8
View File
@@ -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) {
// 执行流程发起前的操作
@@ -90,7 +98,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
public Map<String, Object> setVariables(Map<String, Object> flowUser) {
Map<String, Object> 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<ProcessEsAbolishMap
}
@Override
public void saveToDraft(ESAbolishDataVO abolishDataVO) {
CommonVO commonVO = abolishDataVO.getCommon();
ProcessEsAbolish esAbolish = abolishDataVO.getData();
ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH);
if (existDraft != null) esAbolish.setId(existDraft.getProjectId());
saveOrUpdate(esAbolish);
actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ABOLISH, esAbolish.getId());
public void saveToDraft(ProcessInfoVO<ESAbolishDataVO> 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) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
+5 -2
View File
@@ -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<ESArchiveDataVO> processInfoVO) {
archiveService.saveToDraft(processInfoVO);
return Result.OK();
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java
+2 -1
View File
@@ -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
+22 -7
View File
@@ -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) {
CommonVO commonVO = archiveDataVO.getCommon();
ProcessEsArchive esArchive = archiveDataVO.getData();
ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ARCHIVE);
if (existDraft != null) esArchive.setId(existDraft.getProjectId());
saveOrUpdate(esArchive);
actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ARCHIVE, esArchive.getId());
public void saveToDraft(ProcessInfoVO<ESArchiveDataVO> 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) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
+7 -4
View File
@@ -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<ESRecheckDataVO> processInfoVO) {
recheckService.saveToDraft(processInfoVO);
return Result.OK();
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java
+2 -1
View File
@@ -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
+22 -7
View File
@@ -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) {
CommonVO commonVO = recheckData.getCommon();
ProcessEsRecheck esRecheck = recheckData.getData();
ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_RECHECK);
if (existDraft != null) esRecheck.setId(existDraft.getProjectId());
saveOrUpdate(esRecheck);
actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_RECHECK, esRecheck.getId());
public void saveToDraft(ProcessInfoVO<ESRecheckDataVO> 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) {