[fix] 优化历史预算管理功能

2025-07-31 03:14:06 +08:00 · 2024-08-20 16:19:22 +08:00
parent 67dcab5a0f
commit 5a6c76f8cb
43 changed files with 1007 additions and 619 deletions
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
@@ -2,12 +2,9 @@ package cn.iocoder.yudao.module.bpm.api.task;

 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.bpm.api.task.dto.BpmProcessInstanceGetRespDTO;
 import jakarta.validation.Valid;

-import java.util.List;
-
 /**
 * 流程实例 Api 接口
 *
@@ -24,20 +21,8 @@ public interface BpmProcessInstanceApi {
     */
    String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO);

-
    /**
-     * 查询流程
-     *
-     * @param id 流程id
-     * @return
+     * 获得流程实例
     */
-    BpmProcessInstanceRespDTO getProcessInstance(String id);
-
-
-    /**
-     * 查询指定流程的任务
-     * @param id 流程id
-     * @return
-     */
-    List<BpmTaskRespDTO> getTask(String id);
+    BpmProcessInstanceGetRespDTO getProcessInstance(String processInstanceId);
 }
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceGetRespDTO.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceGetRespDTO.java
@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.bpm.api.task.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程实例的创建 Request DTO
+ *
+ * @author 芋道源码
+ */
+@Data
+public class BpmProcessInstanceGetRespDTO {
+
+    /**
+     * 流程名
+     */
+    private String name;
+
+    /**
+     * 发起流程的用户
+     */
+    private User startUser;
+
+    @Data
+    public static class User {
+        /**
+         * 用户编号
+         */
+        private Long id;
+        /**
+         * 用户昵称
+         */
+        private String nickname;
+
+        /**
+         * 部门编号
+         */
+        private Long deptId;
+        /**
+         * 部门名称
+         */
+        private String deptName;
+
+    }
+
+    /**
+     * 流程实例状态
+     */
+    private Integer status;
+
+    /**
+     * 当前审批中的任务
+     */
+    private List<Task> tasks; // 仅在流程实例分页才返回
+
+    @Data
+    public static class Task {
+        /**
+         * 流程任务编号
+         */
+        private String id;
+        /**
+         * 任务名称
+         */
+        private String name;
+
+    }
+
+    /**
+     * 发起时间
+     */
+    private LocalDateTime startTime;
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+    /**
+     * 持续时间
+     */
+    private Long durationInMillis;
+
+}
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
@@ -36,6 +36,7 @@ public interface ErrorCodeConstants {
    ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF = new ErrorCode(1_009_004_002, "流程取消失败，该流程不是你发起的");
    ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG = new ErrorCode(1_009_004_003, "审批任务({})的审批人未配置");
    ErrorCode PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS = new ErrorCode(1_009_004_004, "审批任务({})的审批人({})不存在");
+    ErrorCode PROCESS_INSTANCE_NOT_END = new ErrorCode(1_009_004_005, "流程实例创建失败，该流程还未结束");

    // ========== 流程任务 1-009-005-000 ==========
    ErrorCode TASK_OPERATE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1_009_005_001, "操作失败，原因：该任务的审批人不是你");
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
@@ -1,41 +1,28 @@
 package cn.iocoder.yudao.module.bpm.api.task;

-import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 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.bpm.api.task.dto.BpmProcessInstanceGetRespDTO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
 import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
-import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
-import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.task.api.history.HistoricTaskInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;

-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

 /**
 * Flowable 流程实例 Api 实现类
@@ -50,29 +37,22 @@ public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
    @Resource
    private BpmProcessInstanceService processInstanceService;

+    @Resource
+    private BpmProcessDefinitionService processDefinitionService;
+
    @Resource
    private AdminUserApi adminUserApi;

    @Resource
    private DeptApi deptApi;

-    @Resource
-    private BpmProcessDefinitionService processDefinitionService;
-
-    @Resource
-    private BpmTaskService taskService;
-
-    @Resource
-    private BpmFormService formService;
-
    @Override
    public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO) {
        return processInstanceService.createProcessInstance(userId, reqDTO);
    }

    @Override
-    public BpmProcessInstanceRespDTO getProcessInstance(String id) {
-
+    public BpmProcessInstanceGetRespDTO getProcessInstance(String id) {
        HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(id);
        if (processInstance == null) {
            return null;
@@ -83,46 +63,17 @@ public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
                processInstance.getProcessDefinitionId());
        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(
                processInstance.getProcessDefinitionId());
-
        String bpmnXml = BpmnModelUtils.getBpmnXml(
                processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()));
-
        AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(processInstance.getStartUserId()));
        DeptRespDTO dept = null;
        if (startUser != null) {
            dept = deptApi.getDept(startUser.getDeptId());
        }
+
        BpmProcessInstanceRespVO bpmProcessInstanceRespVO = BpmProcessInstanceConvert.INSTANCE.buildProcessInstance(processInstance,
                processDefinition, processDefinitionInfo, bpmnXml, startUser, dept);
-
-        return BeanUtils.toBean(bpmProcessInstanceRespVO, BpmProcessInstanceRespDTO.class);
-
-    }
-
-    //List<BpmTaskRespVO>
-    @Override
-    public List<BpmTaskRespDTO> getTask(String id) {
-        List<HistoricTaskInstance> taskList = taskService.getTaskListByProcessInstanceId(id);
-        if (CollUtil.isEmpty(taskList)) {
-            return null;
-        }
-
-        // 拼接数据
-        HistoricProcessInstance processInstance = processInstanceService.getHistoricProcessInstance(id);
-        // 获得 User 和 Dept Map
-        Set<Long> userIds = convertSetByFlatMap(taskList, task ->
-                Stream.of(NumberUtils.parseLong(task.getAssignee()), NumberUtils.parseLong(task.getOwner())));
-        userIds.add(NumberUtils.parseLong(processInstance.getStartUserId()));
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
-        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
-                convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
-        // 获得 Form Map
-        Map<Long, BpmFormDO> formMap = formService.getFormMap(
-                convertSet(taskList, task -> NumberUtils.parseLong(task.getFormKey())));
-        List<BpmTaskRespVO> bpmTaskRespVOS = BpmTaskConvert.INSTANCE.buildTaskListByProcessInstanceId(taskList, processInstance,
-                formMap, userMap, deptMap);
-        return BeanUtils.toBean(bpmTaskRespVOS, BpmTaskRespDTO.class);
-
+        return BeanUtils.toBean(bpmProcessInstanceRespVO, BpmProcessInstanceGetRespDTO.class);
    }