【功能修改】流程抄送查询返回 activityId 字段

jason
1 parent 62e75a0b
Showing 5 changed files with 8 additions and 7 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/cc/BpmProcessInstanceCopyRespVO.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java
@@ -60,9 +60,9 @@ public class BpmProcessInstanceCopyController {
             return success(new PageResult<>(pageResult.getTotal()));
         }
-        // 拼接返回
-        Map<String, String> taskNameMap = taskService.getTaskNameByTaskIds(
-                convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getTaskId));
+        // 拼接返回 TODO @芋艿。这个 taskName 查询是不是可以不用。 保存的时候 taskName 已经存了, review 一下。 不知道有什么特殊场景
+//      Map<String, String> taskNameMap = taskService.getTaskNameByTaskIds(
+//                convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getTaskId));
         Map<String, HistoricProcessInstance> processInstanceMap = processInstanceService.getHistoricProcessInstanceMap(
                 convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessInstanceId));
         Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(),
@@ -70,7 +70,7 @@ public class BpmProcessInstanceCopyController {
         return success(BeanUtils.toBean(pageResult, BpmProcessInstanceCopyRespVO.class, copyVO -> {
             MapUtils.findAndThen(userMap, Long.valueOf(copyVO.getCreator()), user -> copyVO.setCreatorName(user.getNickname()));
             MapUtils.findAndThen(userMap, copyVO.getStartUserId(), user -> copyVO.setStartUserName(user.getNickname()));
-            MapUtils.findAndThen(taskNameMap, copyVO.getTaskId(), copyVO::setTaskName);
+//            MapUtils.findAndThen(taskNameMap, copyVO.getTaskId(), copyVO::setTaskName);
             MapUtils.findAndThen(processInstanceMap, copyVO.getProcessInstanceId(),
                     processInstance -> copyVO.setProcessInstanceStartTime(DateUtils.of(processInstance.getStartTime())));
         }));
@@ -24,6 +24,8 @@ public class BpmProcessInstanceCopyRespVO {
     @Schema(description = "流程实例的发起时间")
     private LocalDateTime processInstanceStartTime;
+    @Schema(description = "抄送的节点的活动编号")
+    private String activityId;
     @Schema(description = "发起抄送的任务编号")
     private String taskId;
     @Schema(description = "发起抄送的任务名称")
@@ -57,7 +57,6 @@ public class BpmProcessInstanceCopyDO extends BaseDO {
     private String activityId;
     /**
      * 任务主键
-     * // @芋艿  这个 taskId 是不是可以去掉了；TODO 可能要留着，因为得知道是来自哪个 task 的抄送
      * 关联 Task 的 id 属性
      */
     private String taskId;
@@ -20,7 +20,7 @@ public interface BpmProcessInstanceCopyMapper extends BaseMapperX&lt;BpmProcessInst
                 .orderByDesc(BpmProcessInstanceCopyDO::getId));
     }
-    default List<BpmProcessInstanceCopyDO> selectListByProcessIstanceIdAndActivityId(String processInstanceId, String activityId) {
+    default List<BpmProcessInstanceCopyDO> selectListByProcessInstanceIdAndActivityId(String processInstanceId, String activityId) {
         return selectList(BpmProcessInstanceCopyDO::getProcessInstanceId, processInstanceId,
                 BpmProcessInstanceCopyDO::getActivityId, activityId);
     }
@@ -89,7 +89,7 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
     @Override
     public Set<Long> getCopyUserIds(String processInstanceId, String activityId) {
-        return CollectionUtils.convertSet(processInstanceCopyMapper.selectListByProcessIstanceIdAndActivityId(processInstanceId, activityId),
+        return CollectionUtils.convertSet(processInstanceCopyMapper.selectListByProcessInstanceIdAndActivityId(processInstanceId, activityId),
                 BpmProcessInstanceCopyDO::getUserId);
     }