BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 66615f9e14aae4c41b27b5795181a21cc60a9641

Authored by kyle
1 parent b2370564

chore: 整理代码

Inline Side-by-side
Showing 3 changed files with 9 additions and 67 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
  View file @66615f9
... ... @@ -49,7 +49,7 @@ public class BpmProcessInstanceCopyController {
49 49 @PostMapping("/create")
50 50 @Operation(summary = "抄送流程")
51 51 @PreAuthorize("@ss.hasPermission('bpm:process-instance-cc:create')")
52   - public CommonResult<Boolean> createProcessInstanceCC(@Valid @RequestBody BpmProcessInstanceCopyCreateReqVO createReqVO) {
  52 + public CommonResult<Boolean> createProcessInstanceCopy(@Valid @RequestBody BpmProcessInstanceCopyCreateReqVO createReqVO) {
53 53 processInstanceCopyService.createProcessInstanceCopy(getLoginUserId(), createReqVO);
54 54 return success(true);
55 55 }
... ... @@ -57,7 +57,7 @@ public class BpmProcessInstanceCopyController {
57 57 @GetMapping("/my-page")
58 58 @Operation(summary = "获得抄送流程分页列表")
59 59 @PreAuthorize("@ss.hasPermission('bpm:process-instance-cc:query')")
60   - public CommonResult<PageResult<BpmProcessInstanceCopyPageItemRespVO>> getProcessInstanceCCPage(
  60 + public CommonResult<PageResult<BpmProcessInstanceCopyPageItemRespVO>> getProcessInstanceCopyPage(
61 61 @Valid BpmProcessInstanceCopyMyPageReqVO pageReqVO) {
62 62 PageResult<BpmProcessInstanceCopyDO> pageResult = processInstanceCopyService.getMyProcessInstanceCopyPage(getLoginUserId(), pageReqVO);
63 63 if (CollUtil.isEmpty(pageResult.getList())) {
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmProcessInstanceCopyVO.java deleted
View file @b237056
1   -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -
6   -import java.time.LocalDateTime;
7   -
8   -// TODO @kyle：1）明确是 Req 还是 Resp；2）注释可以合并到 swagger 里；3）example 写一下，这样一些 mock 接口平台可以读取 example
9   -/**
10   - * 流程抄送视图对象
11   - */
12   -@Data
13   -public class BpmProcessInstanceCopyVO {
14   -
15   - /**
16   - * 编号
17   - */
18   - @Schema(description = "抄送主键")
19   - private Long id;
20   -
21   - /**
22   - * 发起人Id
23   - */
24   - @Schema(description = "发起人Id")
25   - private Long startUserId;
26   -
27   - @Schema(description = "发起人别名")
28   - private String startUserNickname;
29   -
30   - /**
31   - * 流程主键
32   - */
33   - @Schema(description = "流程实例的主键")
34   - private String processInstanceId;
35   -
36   - @Schema(description = "流程实例的名字")
37   - private String processInstanceName;
38   -
39   - /**
40   - * 任务主键
41   - */
42   - @Schema(description = "发起抄送的任务编号")
43   - private String taskId;
44   -
45   - @Schema(description = "发起抄送的任务名称")
46   - private String taskName;
47   - /**
48   - * 用户主键
49   - */
50   - @Schema(description = "用户编号")
51   - private Long userId;
52   -
53   - @Schema(description = "用户别名")
54   - private Long userNickname;
55   -
56   - @Schema(description = "抄送原因")
57   - private String reason;
58   -
59   - @Schema(description = "抄送人")
60   - private String creator;
61   -
62   - @Schema(description = "抄送时间")
63   - private LocalDateTime createTime;
64   -
65   -}
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/handler/MultiInstanceHandler.java
  View file @66615f9
... ... @@ -34,6 +34,13 @@ public class MultiInstanceHandler {
34 34 @Resource
35 35 private PermissionApi permissionApi;
36 36  
  37 + /**
  38 + * 流程发起人那种情况不需要处理，
  39 + * 由 flowable 完成
  40 + *
  41 + * @param execution flowable的执行对象
  42 + * @return 用户ID
  43 + */
37 44 public Set<String> getUserIds(DelegateExecution execution) {
38 45 Set<String> candidateUserIds = new LinkedHashSet<>();
39 46 FlowElement flowElement = execution.getCurrentFlowElement();
... ...