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

[feat] 新增外包合同管理的流程管理 新增外包合同历史管理

Browse Source
This commit is contained in:
wyw 2024-08-26 10:16:55 +08:00
parent b40fda808a
commit ab33b02df4
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/OutsContractController.java
View File

@ -7,7 +7,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.file.FileUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractRespVO;
@ -108,8 +107,8 @@ public class OutsContractController {
@PostMapping("/get_process")
@Operation(summary = "查询流程")
@PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:create')")
public CommonResult<OutsContractProcessInstanceRespVO> getExtContractProcessInstance(@RequestParam("id") Long id) {
OutsContractProcessInstanceRespVO process = outsContractService.getProcess(id);
public CommonResult<OutsContractProcessInstanceRespVO> getExtContractProcessInstance(@RequestParam("processId") String processId) {
OutsContractProcessInstanceRespVO process = outsContractService.getProcess(processId);
return success(process);
}
}

6
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java
View File

@ -66,8 +66,8 @@ public interface OutsContractService {
/**
* 查询流程
* @param id 外包合同id
* @return
* @param processId 外包合同流程id
* @return 流程实例
*/
OutsContractProcessInstanceRespVO getProcess(Long id);
OutsContractProcessInstanceRespVO getProcess(String processId);
}

14
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java
View File

@ -7,13 +7,11 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceGetRespDTO;
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractProcessInstanceRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontract.vo.OutsContractSaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO;
import cn.iocoder.yudao.module.cms.dal.dataobject.extcontracthistory.ExtContractHistoryDO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDetailDO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
@ -207,18 +205,14 @@ public class OutsContractServiceImpl implements OutsContractService {
}
@Override
public OutsContractProcessInstanceRespVO getProcess(Long id) {
OutsContractHistoryDO outsContractHistory = outsContractHistoryMapper.selectOne("outs_contract_id", id);
String processInstanceId = outsContractHistory.getProcessInstanceId();
BpmProcessInstanceGetRespDTO processInstance = bpmProcessInstanceApi.getProcessInstance(processInstanceId);
public OutsContractProcessInstanceRespVO getProcess(String processId) {
//返回的是基础信息，具体信息从bpm里调用
BpmProcessInstanceGetRespDTO processInstance = bpmProcessInstanceApi.getProcessInstance(processId);
OutsContractProcessInstanceRespVO outsContractProcessInstanceRespVO = new OutsContractProcessInstanceRespVO();
BeanUtil.copyProperties(processInstance, outsContractProcessInstanceRespVO);
outsContractHistoryMapper.updateById(outsContractHistory.setProcessStatus(processInstance.getStatus()));
//其他具体信息可以从bpm里面调用
return outsContractProcessInstanceRespVO;
}