BJ_ZTEITS-Developers / parking-cloud-yudao

Commit abea0edf2306d61b7ade028bcf7e2e6f9282fbd5

Authored by jason
1 parent 62e75a0b

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

Inline Side-by-side
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
  View file @abea0ed
... ... @@ -60,9 +60,9 @@ public class BpmProcessInstanceCopyController {
60 60 return success(new PageResult<>(pageResult.getTotal()));
61 61 }
62 62  
63   - // 拼接返回
64   - Map<String, String> taskNameMap = taskService.getTaskNameByTaskIds(
65   - convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getTaskId));
  63 + // 拼接返回 TODO @芋艿。这个 taskName 查询是不是可以不用。 保存的时候 taskName 已经存了, review 一下。 不知道有什么特殊场景
  64 +// Map<String, String> taskNameMap = taskService.getTaskNameByTaskIds(
  65 +// convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getTaskId));
66 66 Map<String, HistoricProcessInstance> processInstanceMap = processInstanceService.getHistoricProcessInstanceMap(
67 67 convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessInstanceId));
68 68 Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(),
... ... @@ -70,7 +70,7 @@ public class BpmProcessInstanceCopyController {
70 70 return success(BeanUtils.toBean(pageResult, BpmProcessInstanceCopyRespVO.class, copyVO -> {
71 71 MapUtils.findAndThen(userMap, Long.valueOf(copyVO.getCreator()), user -> copyVO.setCreatorName(user.getNickname()));
72 72 MapUtils.findAndThen(userMap, copyVO.getStartUserId(), user -> copyVO.setStartUserName(user.getNickname()));
73   - MapUtils.findAndThen(taskNameMap, copyVO.getTaskId(), copyVO::setTaskName);
  73 +// MapUtils.findAndThen(taskNameMap, copyVO.getTaskId(), copyVO::setTaskName);
74 74 MapUtils.findAndThen(processInstanceMap, copyVO.getProcessInstanceId(),
75 75 processInstance -> copyVO.setProcessInstanceStartTime(DateUtils.of(processInstance.getStartTime())));
76 76 }));
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/cc/BpmProcessInstanceCopyRespVO.java
  View file @abea0ed
... ... @@ -24,6 +24,8 @@ public class BpmProcessInstanceCopyRespVO {
24 24 @Schema(description = "流程实例的发起时间")
25 25 private LocalDateTime processInstanceStartTime;
26 26  
  27 + @Schema(description = "抄送的节点的活动编号")
  28 + private String activityId;
27 29 @Schema(description = "发起抄送的任务编号")
28 30 private String taskId;
29 31 @Schema(description = "发起抄送的任务名称")
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
  View file @abea0ed
... ... @@ -57,7 +57,6 @@ public class BpmProcessInstanceCopyDO extends BaseDO {
57 57 private String activityId;
58 58 /**
59 59 * 任务主键
60   - * // @芋艿 这个 taskId 是不是可以去掉了；TODO 可能要留着，因为得知道是来自哪个 task 的抄送
61 60 * 关联 Task 的 id 属性
62 61 */
63 62 private String taskId;
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceCopyMapper.java
  View file @abea0ed
... ... @@ -20,7 +20,7 @@ public interface BpmProcessInstanceCopyMapper extends BaseMapperX&lt;BpmProcessInst
20 20 .orderByDesc(BpmProcessInstanceCopyDO::getId));
21 21 }
22 22  
23   - default List<BpmProcessInstanceCopyDO> selectListByProcessIstanceIdAndActivityId(String processInstanceId, String activityId) {
  23 + default List<BpmProcessInstanceCopyDO> selectListByProcessInstanceIdAndActivityId(String processInstanceId, String activityId) {
24 24 return selectList(BpmProcessInstanceCopyDO::getProcessInstanceId, processInstanceId,
25 25 BpmProcessInstanceCopyDO::getActivityId, activityId);
26 26 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java
  View file @abea0ed
... ... @@ -89,7 +89,7 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
89 89  
90 90 @Override
91 91 public Set<Long> getCopyUserIds(String processInstanceId, String activityId) {
92   - return CollectionUtils.convertSet(processInstanceCopyMapper.selectListByProcessIstanceIdAndActivityId(processInstanceId, activityId),
  92 + return CollectionUtils.convertSet(processInstanceCopyMapper.selectListByProcessInstanceIdAndActivityId(processInstanceId, activityId),
93 93 BpmProcessInstanceCopyDO::getUserId);
94 94 }
95 95  
... ...