[feat] 新增合同管理中的流程查询功能

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.cms.controller.admin.contract;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessInstanceRespVO;
 import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractPageReqVO;
 import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
 import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractSaveReqVO;
@@ -39,6 +40,8 @@ public class ContractController {
     @Resource
     private ContractService contractService;
 
+
+
     @PostMapping("/create")
     @Operation(summary = "创建合同")
     @PreAuthorize("@ss.hasPermission('cms:contract:create')")
@@ -92,4 +95,17 @@ public class ContractController {
         ExcelUtils.write(response, "合同.xls", "数据", ContractRespVO.class,
                 BeanUtils.toBean(list, ContractRespVO.class));
     }
+
+    @GetMapping("/get_process")
+    @Operation(summary = "查询流程")
+    @Parameter(name = "id", description = "合同id", required = true)
+    @PreAuthorize("@ss.hasPermission('cms:contract:process')")
+    public CommonResult<ContractProcessInstanceRespVO> getContractProcess(@RequestParam("id") Long id) {
+        ContractProcessInstanceRespVO contractProcessInstance = contractService.getContractProcess(id);
+        return success(contractProcessInstance);
+    }
+
+
+
+
 }

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractProcessInstanceRespVO.java

@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "管理后台 - 流程实例的 Response VO")
+@Data
+public class ContractProcessInstanceRespVO {
+
+    @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String id;
+
+    @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String name;
+
+    @Schema(description = "流程分类", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String category;
+
+    @Schema(description = "流程分类名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String categoryName;
+
+    @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
+
+    @Schema(description = "发起时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime endTime;
+
+    @Schema(description = "持续时间", example = "1000")
+    private Long durationInMillis;
+
+    @Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, Object> formVariables;
+
+    @Schema(description = "业务的唯一标识-例如说，请假申请的编号", example = "1")
+    private String businessKey;
+
+    /**
+     * 发起流程的用户
+     */
+    private User startUser;
+
+    /**
+     * 当前审批中的任务
+     */
+    private List<Task> tasks; // 仅在流程实例分页才返回
+
+    @Schema(description = "用户信息")
+    @Data
+    public static class User {
+
+        @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+        private Long id;
+        @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+        private String nickname;
+
+        @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+        private Long deptId;
+        @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
+        private String deptName;
+
+    }
+
+    @Schema(description = "流程任务")
+    @Data
+    public static class Task {
+
+        @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+        private String id;
+
+        @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        private String name;
+
+    }
+
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractService.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.cms.service.contract;
 
 import jakarta.validation.*;
 import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.*;
-import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
 import java.math.BigDecimal;
@@ -73,4 +72,10 @@ public interface ContractService {
     void validateContractExists(Long id);
 
 
+    /**
+     * 查询流程
+     * @param id 合同id
+     */
+    ContractProcessInstanceRespVO getContractProcess(Long id);
+
 }

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java

@@ -2,9 +2,12 @@ package cn.iocoder.yudao.module.cms.service.contract;
 
 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.BpmProcessInstanceRespDTO;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmTaskRespDTO;
 import cn.iocoder.yudao.module.cms.dal.dataobject.contractHistory.ContractHistoryDO;
 import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper;
 import cn.iocoder.yudao.module.cms.dal.mysql.contractHistory.ContractHistoryMapper;
+import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum;
 import cn.iocoder.yudao.module.pms.api.ProjectApi;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO;
 import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
@@ -61,6 +64,9 @@ public class ContractServiceImpl implements ContractService {
     @Resource
     private ContractHistoryMapper contractHistoryMapper;
 
+    @Resource
+    private BpmProcessInstanceApi bpmProcessInstanceApi;
+
     @Override
     public Long createContract(Long loginUserId, ContractSaveReqVO createReqVO) {
 
@@ -83,7 +89,6 @@ public class ContractServiceImpl implements ContractService {
         ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId);
 
 
-        //todo 待提取
         String code = createReqVO.getCode();
         String trackingDep = createReqVO.getTrackingDep();
         String projectManager = createReqVO.getProjectManager();
@@ -224,6 +229,8 @@ public class ContractServiceImpl implements ContractService {
         contractRespVO.setTrackingDep(projectDetail.getTrackingDepName());
         contractRespVO.setProjectManager(projectDetail.getProjectManagerName());
 
+        // TODO 枚举优化
+        contractRespVO.setType(ContractTypeEnum.getNoByCode(contractRespVO.getType()));
         //分包合同商议提示 TODO 待优化
 //        ExtContractDO extContractDO = extContractMapper.selectOne("project_id", projectId);
 //        LocalDateTime reminderTime = extContractDO.getReminderTime();
@@ -265,6 +272,36 @@ public class ContractServiceImpl implements ContractService {
         return pageResult;
     }
 
+
+    @Override
+    public ContractProcessInstanceRespVO getContractProcess(Long id) {
+        validateContractExists(id);
+        //去历史里面找
+        ContractHistoryDO contractHistory = contractHistoryMapper.selectOne("contract_id", id);
+        if (contractHistory == null) {
+            throw exception(CONTRACT_NOT_EXISTS);
+        }
+        //拿到历史之后 找到process_instance_id 和 status
+        String processInstanceId = contractHistory.getProcessInstanceId();
+        String processStatus = contractHistory.getProcessStatus();
+        //与当前流程里的进行比较
+        String status = String.valueOf(bpmProcessInstanceApi.getProcessInstance(processInstanceId).getStatus());
+
+        //如果不相等
+        if (!status.equals(processStatus)){
+            //更新当前合同对应历史表里面的状态
+            contractHistory.setProcessStatus(status);
+            contractHistoryMapper.updateById(contractHistory);
+        }
+        //返回给前端必要的数据 当前流程里面对应的数据
+        BpmProcessInstanceRespDTO processInstance = bpmProcessInstanceApi.getProcessInstance(processInstanceId);
+        List<BpmTaskRespDTO> tasks = bpmProcessInstanceApi.getTask(processInstanceId);
+        List<BpmProcessInstanceRespDTO.Task> taskList = BeanUtils.toBean(tasks, BpmProcessInstanceRespDTO.Task.class);
+        processInstance.setTasks(taskList);
+
+        return BeanUtils.toBean(processInstance, ContractProcessInstanceRespVO.class);
+    }
+
     @Override
     public BigDecimal getProvisionalSettlementById(Long id) {
         ContractDO contractDO = contractMapper.selectById(id);

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java

@@ -95,6 +95,7 @@ public class ContractHistoryServiceImpl implements cn.iocoder.yudao.module.cms.s
 //        6.分包合同商议提示 √
 //        7.暂定结算数 √
 
+        // TODO 枚举优化
         ProjectRespDTO project = projectApi.getProject(projectId);
         contractHistoryRespVO.setCode(project.getCode());
         contractHistoryRespVO.setDrawingCompany(project.getDrawingCompany());

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

@@ -102,7 +102,7 @@ public class ExtContractServiceImpl implements ExtContractService {
         //        5.合同总金额 √
         //        6.合同商议提示（和分包提示不一样）√
 
-        //todo 待提取
+        //todo 待提取 枚举优化
         String code = createReqVO.getCode();
         String trackingDep = createReqVO.getTrackingDep();
         String projectManager = createReqVO.getProjectManager();

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java

@@ -104,7 +104,7 @@ public class ExtContractHistoryServiceImpl implements ExtContractHistoryService
         CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
         String name = customerCompanyDO.getName();
         HistoryResp.setCustomerCompanyName(name);
-
+        // TODO 枚举优化
 
         //合同总金额
 

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

@@ -94,7 +94,7 @@ public class OutsContractServiceImpl implements OutsContractService {
         //        3.项目经理 √
         //        4.签订合同总额 √
 
-        //todo 待提取
+        //todo 待提取 枚举优化
         String name = createReqVO.getName();
         String trackingDep = createReqVO.getTrackingDep();
         String projectManager = createReqVO.getProjectManager();

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java

@@ -65,7 +65,7 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
         OutsContractHistoryRespVO outsContractHistoryResp = BeanUtils.toBean(outsContractHistoryDO, OutsContractHistoryRespVO.class);
         Long contractId = outsContractHistoryResp.getContractId();
         ContractRespVO contract = contractService.getContract(contractId);
-
+        // TODO 枚举优化
         outsContractHistoryResp.setName(contract.getName());
         outsContractHistoryResp.setTrackingDep(contract.getTrackingDep());
         outsContractHistoryResp.setProjectManager(contract.getProjectManager());