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 14:40:02 +08:00
parent 63b8339f40
commit f49b147ee2
25 changed files with 190 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+1 -1
View File
@@ -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<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java
+7 -4
View File
@@ -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));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java
-1
View File
@@ -20,5 +20,4 @@ public interface ProcessEsAbolishService extends IService<ProcessEsAbolish> {
void approval(ESAbolishDataVO annualInitData, boolean pass);
ESAbolishDataVO getDraftData(String draftId, String projectId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
-19
View File
@@ -184,25 +184,6 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
}
}
@Override
public ESAbolishDataVO getDraftData(String draftId, String businessId) {
ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_ABOLISH);
if (draft == null) {
throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
} else {
ESAbolishDataVO abolishDataVO = new ESAbolishDataVO();
// 获取流程通用数据
CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
abolishDataVO.setCommon(commonVO);
// 获取流程实例数据
LambdaQueryWrapper<ProcessEsAbolish> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProcessEsAbolish::getId, businessId);
lambdaQueryWrapper.eq(ProcessEsAbolish::getDelFlag, YesOrNoEnum.NO.getValue());
ProcessEsAbolish data = getOne(lambdaQueryWrapper);
abolishDataVO.setData(data);
return abolishDataVO;
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
+24 -4
View File
@@ -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<AnnualInitDataVO> 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 = "企标年度制修订标准化发起流程-办理")
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/ProcessEsAnnualInitService.java
+2 -1
View File
@@ -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<ProcessEsAnnualInit
void startProcess(AnnualInitDataVO annualInitData);
void saveToDraft(AnnualInitDataVO annualInitData);
void saveToDraft(ProcessInfoVO<AnnualInitDataVO> annualInitData);
AnnualInitDataVO getHandleData(String taskId);
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+14 -3
View File
@@ -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<ProcessEsAnnualI
@Resource
private ImportUtil importUtil;
@Resource
private IProcessHandleService processHandleService;
@Override
public void startProcess(AnnualInitDataVO annualInitData) {
// 执行流程发起前的操作
@@ -168,8 +176,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
}
@Override
public void saveToDraft(AnnualInitDataVO annualInitData) {
public void saveToDraft(ProcessInfoVO<AnnualInitDataVO> processInfoVO) {
// 流程信息
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ANNUAL_INIT.getValue()); // 流程类型
processHandleService.saveToDraft(processInfoVO);
}
@Override
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
+22 -3
View File
@@ -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<AnnualReportDataVO> 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));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/ProcessEsAnnualReportService.java
+2 -2
View File
@@ -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<ProcessEsAnnualRe
void approvalProcess(AnnualReportDataVO annualReportDataVO, boolean b);
void saveToDraft(AnnualReportDataVO annualReportDataVO);
void saveToDraft(ProcessInfoVO<AnnualReportDataVO> annualReportDataVO);
AnnualReportDataVO getHandleData(String taskId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+11 -7
View File
@@ -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<ProcessEsAnnua
@Resource
private ImportUtil importUtil;
@Resource
private IProcessHandleService processHandleService;
@Override
public void startProcess(AnnualReportDataVO annualReportData) {
// 流程Key
@@ -241,8 +242,11 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
}
@Override
public void saveToDraft(AnnualReportDataVO annualReportDataVO) {
public void saveToDraft(ProcessInfoVO<AnnualReportDataVO> processInfoVO) {
// 流程信息
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ES_ANNUAL_REPORT.getValue()); // 流程类型
processHandleService.saveToDraft(processInfoVO);
}
@Override
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
+1 -1
View File
@@ -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));
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java
-1
View File
@@ -20,5 +20,4 @@ public interface ProcessEsArchiveService extends IService<ProcessEsArchive> {
void approval(ESArchiveDataVO archiveData, boolean pass);
ESArchiveDataVO getDraftData(String draftId, String projectId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
-20
View File
@@ -183,26 +183,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
}
}
@Override
public ESArchiveDataVO getDraftData(String draftId, String businessId) {
ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_ARCHIVE);
if (draft == null) {
throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
} else {
ESArchiveDataVO archiveDataVO = new ESArchiveDataVO();
// 获取流程通用数据
CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
archiveDataVO.setCommon(commonVO);
// 获取流程实例数据
LambdaQueryWrapper<ProcessEsArchive> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProcessEsArchive::getId, businessId);
lambdaQueryWrapper.eq(ProcessEsArchive::getDelFlag, YesOrNoEnum.NO.getValue());
ProcessEsArchive data = getOne(lambdaQueryWrapper);
archiveDataVO.setData(data);
return archiveDataVO;
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java
+13 -6
View File
@@ -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<ESChangeDataVO> 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));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/ProcessEsChangeService.java
+2 -4
View File
@@ -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<ProcessEsChange> {
void startProcess(ESChangeDataVO changeData);
void saveToDraft(ESChangeDataVO changeData);
void saveToDraft(ProcessInfoVO<ESChangeDataVO> changeData);
ESChangeDataVO getHandleData(String taskId);
void approval(ESChangeDataVO changeData, boolean pass);
ESChangeDataVO getDraftData(String draftId, String projectId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+23 -48
View File
@@ -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<ProcessEsChangeMappe
@Resource
private ISysUserDepartService userDepartService;
@Resource
private IProcessHandleService processHandleService;
@Override
public void startProcess(ESChangeDataVO changeData) {
// 执行流程发起前的操作
@@ -137,25 +140,20 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
}
@Override
public void saveToDraft(ESChangeDataVO changeData) {
String userId = UserUtils.getUserId();
CommonVO commonVO = changeData.getCommon();
ProcessEsChange esChange = changeData.getData();
List<EsChangeOpinion> 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<ESChangeDataVO> 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<ProcessEsChangeMappe
}
}
@Override
public ESChangeDataVO getDraftData(String draftId, String businessId) {
ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_CHANGE);
if (draft == null) {
throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
} else {
ESChangeDataVO changeDataVO = new ESChangeDataVO();
// 获取流程通用数据
CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
changeDataVO.setCommon(commonVO);
// 获取流程实例数据
LambdaQueryWrapper<ProcessEsChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProcessEsChange::getId, businessId);
lambdaQueryWrapper.eq(ProcessEsChange::getDelFlag, YesOrNoEnum.NO.getValue());
ProcessEsChange data = getOne(lambdaQueryWrapper);
LambdaQueryWrapper<EsChangeOpinion> opinionLambdaQueryWrapper = new LambdaQueryWrapper<>();
opinionLambdaQueryWrapper.eq(EsChangeOpinion::getBusinessId, data.getId());
List<EsChangeOpinion> opinionList = esChangeOpinionService.list(opinionLambdaQueryWrapper);
data.setList(opinionList);
changeDataVO.setData(data);
return changeDataVO;
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java
+11 -6
View File
@@ -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<ESEnableDataVO> 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));
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java
+2 -2
View File
@@ -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<ProcessEsEnable> {
void startProcess(ESEnableDataVO enableData);
void saveToDraft(ESEnableDataVO enableData);
void saveToDraft(ProcessInfoVO<ESEnableDataVO> enableData);
ESEnableDataVO getHandleData(String taskId);
void approval(ESEnableDataVO enableData, boolean pass);
ESEnableDataVO getDraftData(String draftId, String projectId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
+22 -26
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.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<ProcessEsEnableMappe
@Resource
private RuntimeService runtimeService;
@Resource
private IProcessHandleService processHandleService;
@Override
public void startProcess(ESEnableDataVO enableData) {
@@ -115,13 +123,20 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
}
@Override
public void saveToDraft(ESEnableDataVO enableDataVO) {
CommonVO commonVO = enableDataVO.getCommon();
ProcessEsEnable esEnable = enableDataVO.getData();
ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ENABLE);
if (existDraft != null) esEnable.setId(existDraft.getProjectId());
saveOrUpdate(esEnable);
actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ENABLE, esEnable.getId());
public void saveToDraft(ProcessInfoVO<ESEnableDataVO> 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<ProcessEsEnableMappe
}
}
@Override
public ESEnableDataVO getDraftData(String draftId, String projectId) {
ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, projectId, ProcessTypeEnum.ES_ENABLE);
if (draft == null) {
throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
} else {
ESEnableDataVO enableDataVO = new ESEnableDataVO();
// 获取流程通用数据
CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
enableDataVO.setCommon(commonVO);
// 获取流程实例数据
LambdaQueryWrapper<ProcessEsEnable> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProcessEsEnable::getId, projectId);
lambdaQueryWrapper.eq(ProcessEsEnable::getDelFlag, YesOrNoEnum.NO.getValue());
ProcessEsEnable data = getOne(lambdaQueryWrapper);
enableDataVO.setData(data);
return enableDataVO;
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+12 -6
View File
@@ -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<InitChangeDataVO> 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));
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
+2 -10
View File
@@ -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<ProcessEsInitChange
*
* @param initChangeData
*/
void saveToDraft(InitChangeDataVO initChangeData);
void saveToDraft(ProcessInfoVO<InitChangeDataVO> initChangeData);
/**
* 软删除实例数据
@@ -48,12 +46,6 @@ public interface ProcessEsInitChangeService extends IService<ProcessEsInitChange
*/
InitChangeDataVO getHandleData(String taskId);
/**
* 获取草稿数据
* @param draftId
* @return
*/
InitChangeDataVO getDraftData(String draftId, String businessId);
/**
* 复审-继续有效-自动发起立项变更流程
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+13 -41
View File
@@ -13,12 +13,16 @@ 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.esInitChange.entity.EsInitChangeConstant;
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.ProcessEsInitChange;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
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.esInitChange.mapper.ProcessEsInitChangeMapper;
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.laws.enterprise.service.ESSequenceNumberProvider;
import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
@@ -66,6 +70,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
@Resource
private ILawsEnterpriseStandardService esService;
@Resource
private IProcessHandleService processHandleService;
@Override
public void startProcess(InitChangeDataVO initChangeData) {
// 执行流程发起前的操作
@@ -154,26 +161,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
return initChangeDataVO;
}
@Override
public InitChangeDataVO getDraftData(String draftId, String businessId) {
ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_INIT_CHANGE);
if (draft == null) {
throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
} else{
InitChangeDataVO initChangeDataVO = new InitChangeDataVO();
// 获取流程通用数据
CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
initChangeDataVO.setCommonVO(commonVO);
// 获取流程实例数据
LambdaQueryWrapper<ProcessEsInitChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProcessEsInitChange::getBusinessId, businessId);
lambdaQueryWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue());
List<ProcessEsInitChange> dataList = list(lambdaQueryWrapper);
initChangeDataVO.setDataList(dataList);
return initChangeDataVO;
}
}
@Override
public void autoStartProcessByRecheck(String standardNo) {
// 1. 根据企标编号找到对应企标的主起草人
@@ -272,27 +259,12 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
}
@Override
public void saveToDraft(InitChangeDataVO initChangeData) {
CommonVO commonVO = initChangeData.getCommonVO();
List<ProcessEsInitChange> dataList = initChangeData.getDataList();
public void saveToDraft(ProcessInfoVO<InitChangeDataVO> 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<ProcessEsInitChange> 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) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
+6 -4
View File
@@ -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));
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java
-2
View File
@@ -22,6 +22,4 @@ public interface ProcessEsRecheckService extends IService<ProcessEsRecheck> {
void approval(ESRecheckDataVO recheckData, boolean pass);
ESRecheckDataVO getDraftData(String draftId, String projectId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
-19
View File
@@ -235,25 +235,6 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
actFlowCommonService.removeDraft(commonVO);
}
@Override
public ESRecheckDataVO getDraftData(String draftId, String businessId) {
ProcessDraft draft = actFlowCommonService.getExistDraft(draftId, businessId, ProcessTypeEnum.ES_RECHECK);
if (draft == null) {
throw new JeroBootException(ResultCommon.DRAFT_NOT_EXISTS);
} else {
ESRecheckDataVO recheckDataVO = new ESRecheckDataVO();
// 获取流程通用数据
CommonVO commonVO = actFlowCommonService.getDraftCommon(draft);
recheckDataVO.setCommon(commonVO);
// 获取流程实例数据
LambdaQueryWrapper<ProcessEsRecheck> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProcessEsRecheck::getId, businessId);
lambdaQueryWrapper.eq(ProcessEsRecheck::getDelFlag, YesOrNoEnum.NO.getValue());
ProcessEsRecheck data = getOne(lambdaQueryWrapper);
recheckDataVO.setData(data);
return recheckDataVO;
}
}
}