From ab33b02df4e768d502af2af41d0bc681e8d394e7 Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 10:16:55 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E5=A4=96=E5=8C=85?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E7=9A=84=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=96=B0=E5=A2=9E=E5=A4=96=E5=8C=85?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8E=86=E5=8F=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/outscontract/OutsContractController.java | 5 ++--- .../service/outscontract/OutsContractService.java | 6 +++--- .../outscontract/OutsContractServiceImpl.java | 14 ++++---------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/OutsContractController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/OutsContractController.java index ca539019e..1713eef3e 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/OutsContractController.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontract/OutsContractController.java @@ -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 getExtContractProcessInstance(@RequestParam("id") Long id) { - OutsContractProcessInstanceRespVO process = outsContractService.getProcess(id); + public CommonResult getExtContractProcessInstance(@RequestParam("processId") String processId) { + OutsContractProcessInstanceRespVO process = outsContractService.getProcess(processId); return success(process); } } \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java index 2e4f5572e..a58e3855c 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractService.java @@ -66,8 +66,8 @@ public interface OutsContractService { /** * 查询流程 - * @param id 外包合同id - * @return + * @param processId 外包合同流程id + * @return 流程实例 */ - OutsContractProcessInstanceRespVO getProcess(Long id); + OutsContractProcessInstanceRespVO getProcess(String processId); } \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java index b80b2f9b8..92d9a0b15 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java @@ -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; }