BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 6700267ae9374cd4d589f1de4a5b086fb0bcbc19

Authored by YunaiV
2 parents 3e55b449 5e6e59b5

Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 

# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
Inline Side-by-side
Showing 3 changed files with 1 additions and 47 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
  View file @6700267
... ... @@ -74,15 +74,6 @@ public class BpmTaskController {
74 74 return success(BpmTaskConvert.INSTANCE.buildTodoTaskPage(pageResult, processInstanceMap, userMap));
75 75 }
76 76  
77   - // TODO @jason：这个接口还要哇？
78   - @GetMapping("my-todo")
79   - @Operation(summary = "获取我的待办任务,取第一条")
80   - @Parameter(name = "processInstanceId", description = "流程实例的编号", required = true)
81   - @PreAuthorize("@ss.hasPermission('bpm:task:query')")
82   - public CommonResult<BpmTaskRespVO> getMyTodoTask(@RequestParam("processInstanceId") String processInstanceId) {
83   - return success(taskService.getFirstTodoTask(getLoginUserId(), processInstanceId));
84   - }
85   -
86 77 @GetMapping("done-page")
87 78 @Operation(summary = "获取 Done 已办任务分页")
88 79 @PreAuthorize("@ss.hasPermission('bpm:task:query')")
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmFormFieldsPermissionReqVO.java deleted
View file @3e55b44
1   -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
2   -
3   -import cn.hutool.core.util.StrUtil;
4   -import com.fasterxml.jackson.annotation.JsonIgnore;
5   -import io.swagger.v3.oas.annotations.media.Schema;
6   -import jakarta.validation.constraints.AssertTrue;
7   -import lombok.Data;
8   -
9   -@Schema(description = "管理后台 - 表单字段权限 Request VO")
10   -@Data
11   -public class BpmFormFieldsPermissionReqVO {
12   -
13   - @Schema(description = "流程定义的编号", example = "1024")
14   - private String processDefinitionId;
15   -
16   - @Schema(description = "流程实例的编号", example = "1024")
17   - private String processInstanceId;
18   -
19   - @Schema(description = "流程活动编号", example = "StartUserNode")
20   - private String activityId; // 对应 BPMN XML 节点 Id
21   -
22   - @Schema(description = "流程任务编号", example = "95f2f08b-621b-11ef-bf39-00ff4722db8b")
23   - private String taskId; // UserTask 对应的Id
24   -
25   - @AssertTrue(message = "流程定义的编号和流程实例的编号不能同时为空")
26   - @JsonIgnore
27   - public boolean isValidProcessParam() {
28   - return StrUtil.isNotEmpty(processDefinitionId) || StrUtil.isNotEmpty(processInstanceId);
29   - }
30   -
31   - @AssertTrue(message = "流程活动编号和流程任务编号编号不能同时为空")
32   - @JsonIgnore
33   - public boolean isValidActivityParam() {
34   - return StrUtil.isNotEmpty(activityId) || StrUtil.isNotEmpty(taskId);
35   - }
36   -
37   -}
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
  View file @6700267
... ... @@ -96,7 +96,7 @@ public interface BpmProcessInstanceConvert {
96 96 @Mapping(source = "from.id", target = "to.id", ignore = true)
97 97 void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to);
98 98  
99   - default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, ProcessInstance instance, Integer status) {;
  99 + default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, ProcessInstance instance, Integer status) {
100 100 return new BpmProcessInstanceStatusEvent(source).setId(instance.getId()).setStatus(status)
101 101 .setProcessDefinitionKey(instance.getProcessDefinitionKey()).setBusinessKey(instance.getBusinessKey());
102 102 }
... ...