hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-19 13:35:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[feat] 新增外部合同的流程管理

Browse Source
This commit is contained in:
wyw
2024-08-19 16:47:29 +08:00
parent 5f2cb54ab9
commit f12b055dfe
12 changed files with 89 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extContract/ExtContractController.java
View File

@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
@ -23,11 +24,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@ -45,14 +48,14 @@ public class ExtContractController {
@Operation(summary = "创建外部合同")
@PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:create')")
public CommonResult<Long> createExtContract(@Valid @RequestBody ExtContractSaveReqVO createReqVO) {
return success(extContractService.createExtContract(getLoginUserId(),createReqVO));
return success(extContractService.createExtContract(getLoginUserId(), createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新外部合同")
@PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:update')")
public CommonResult<Boolean> updateExtContract(@Valid @RequestBody ExtContractSaveReqVO updateReqVO) {
extContractService.updateExtContract(getLoginUserId(),updateReqVO);
extContractService.updateExtContract(getLoginUserId(), updateReqVO);
return success(true);
}
@ -92,12 +95,20 @@ public class ExtContractController {
@PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportExtContractExcel(@Valid ExtContractPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<ExtContractRespVO> list = extContractService.getExtContractPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "外部合同.xls", "数据", ExtContractRespVO.class,
BeanUtils.toBean(list, ExtContractRespVO.class));
BeanUtils.toBean(list, ExtContractRespVO.class));
}
@PostMapping("/create_process")
@Operation(summary = "创建流程")
@PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:create')")
public CommonResult<String> createExtContractProcess(@RequestParam("id") Long id) {
String processId = extContractService.createProcess(getLoginUserId(), id);
return success(processId);
}
}

7
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistoryPageReqVO.java
View File

@ -24,17 +24,14 @@ public class ExtContractHistoryPageReqVO extends PageParam {
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
private String type;
@Schema(description = "状态", example = "1")
@Schema(description = "合同状态", example = "1")
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
private String status;
@Schema(description = "流程状态", example = "2")
@Schema(description = "流程状态")
@DictFormat(DictTypeConstants.PROCESS_STATUS)
private Integer processStatus;
@Schema(description = "合同id", example = "26795")
private Long contractId;
@Schema(description = "外部合同id", example = "12093")
private Long extContractId;

2
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontracthistory/vo/ExtContractHistorySaveReqVO.java
View File

@ -133,7 +133,7 @@ public class ExtContractHistorySaveReqVO {
@ExcelProperty("流程实体id")
private String processInstanceId;
@Schema(description = "流程状态", example = "2")
@Schema(description = "流程状态")
@ExcelProperty(value = "流程状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.PROCESS_STATUS)
private Integer processStatus;

11
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractService.java
View File

@ -8,9 +8,6 @@ import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDetailD
import jakarta.validation.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import java.time.LocalDateTime;
import java.util.List;
/**
* 外部合同 Service 接口
*
@ -56,5 +53,13 @@ public interface ExtContractService {
*/
PageResult<ExtContractRespVO> getExtContractPage(ExtContractPageReqVO pageReqVO);
/**
*
* @param loginUserId 当前登录的用户id
* @param id 外部合同id
* @return 流程id
*/
String createProcess(Long loginUserId,Long id);
}

35
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extContract/ExtContractServiceImpl.java
View File

@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.cms.service.extContract;
import cn.hutool.core.bean.BeanUtil;
import cn.iocoder.yudao.framework.common.util.file.FileUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@ -26,6 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.PROCESS_INSTANCE_NOT_END;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
/**
@ -61,6 +63,8 @@ public class ExtContractServiceImpl implements ExtContractService {
@Resource
private ExtContractHistoryMapper extContractHistoryMapper;
@Resource
private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@ -74,7 +78,7 @@ public class ExtContractServiceImpl implements ExtContractService {
projectTrackingApi.validateProjectExists(projectId);
List<ExtContractDO> extContractList = extContractMapper.selectList("project_id", projectId);
for (ExtContractDO extContractDO : extContractList) {
if (extContractDO.getName().equals(trimName)){
if (extContractDO.getName().equals(trimName)) {
throw exception(EXT_CONTRACT_EXISTS);
}
}
@ -90,15 +94,13 @@ public class ExtContractServiceImpl implements ExtContractService {
//版本
if (extContractHistoryMapper.selectCount("project_id", createReqVO.getProjectId()) < 1) {
extContractHistoryDO.setVersion("1");
}else{
} else {
extContractHistoryDO.setVersion(String.valueOf(extContractHistoryMapper.selectCount("project_id", createReqVO.getProjectId()) + 1));
}
//状态
extContractHistoryDO.setProcessStatus(1);
extContractHistoryMapper.insert(extContractHistoryDO);
// 启动流程
if (createReqVO.getId() == null) {
String processInstanceId = processInstanceApi.createProcessInstance(loginUserId,
@ -145,8 +147,8 @@ public class ExtContractServiceImpl implements ExtContractService {
ProjectScheduleDetailDTO projectScheduleDetail = projectScheduleApi.getProjectScheduleDetail(projectId);
ProjectTrackingDetailDTO projectTracking = projectTrackingApi.getProjectTracking(projectId);
BeanUtil.copyProperties(extContractDO, extContractDetailDO);
BeanUtil.copyProperties(projectTracking,extContractDetailDO);
BeanUtil.copyProperties(projectScheduleDetail,extContractDetailDO);
BeanUtil.copyProperties(projectTracking, extContractDetailDO);
BeanUtil.copyProperties(projectScheduleDetail, extContractDetailDO);
return extContractDetailDO;
}
@ -168,6 +170,27 @@ public class ExtContractServiceImpl implements ExtContractService {
return pageResult;
}
@Override
public String createProcess(Long loginUserId, Long id) {
//拿出该合同的当前流程
ExtContractHistoryDO extContractHistoryDO = extContractHistoryMapper.selectOne("ext_contract_id", id);
String processInstanceId0 = extContractHistoryDO.getProcessInstanceId();
//流程引擎里的最新状态
Integer status = bpmProcessInstanceApi.getProcessInstance(processInstanceId0).getStatus();
if (status == 1) {
throw exception(PROCESS_INSTANCE_NOT_END);
}
//创建新的流程
String processInstanceId = processInstanceApi.createProcessInstance(loginUserId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
.setBusinessKey(String.valueOf(id)));
// 写入工作流编号
extContractHistoryMapper.updateById(extContractHistoryDO.setProcessInstanceId(processInstanceId).setProcessStatus(status));
return processInstanceId;
}
private void validateExtContractExists(Long id) {
if (extContractMapper.selectById(id) == null) {
throw exception(EXT_CONTRACT_NOT_EXISTS);