BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 8f171ba3d0bd390d5385a385470dcc500d0181bd

Authored by kyle
1 parent 1bc472b5

feat: 添加抄送人相关功能以及接口

Inline Side-by-side
Showing 16 changed files with 356 additions and 27 deletions
sql/mysql/ruoyi-vue-pro.sql
  View file @8f171ba
... ... @@ -2478,6 +2478,15 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
2478 2478 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2523, '客户限制配置导出', 'crm:customer-limit-config:export', 3, 5, 2518, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-11-18 13:33:53', '', '2023-11-18 13:33:53', b'0');
2479 2479 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2524, '系统配置', '', 1, 99, 2397, 'config', 'ep:connection', '', '', 0, b'1', b'1', b'1', '1', '2023-11-18 21:58:00', '1', '2023-11-18 21:58:00', b'0');
2480 2480 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2525, 'WebSocket 测试', '', 2, 7, 2, 'websocket', 'ep:connection', 'infra/webSocket/index', 'InfraWebSocket', 0, b'1', b'1', b'1', '1', '2023-11-23 19:41:55', '1', '2023-11-24 19:22:30', b'0');
  2481 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,
  2482 + `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,
  2483 + `updater`, `update_time`, `deleted`)
  2484 +VALUES (2526, '抄送流程', '', 2, 21, 1200, 'processInstanceCC', 'eye', '/bpm/task/cc/index',
  2485 + 'BpmCCProcessInstance', 0, true, true, true, 1, '2023-01-13 16:14:00', '1', '2023-01-13 16:14:00', false),
  2486 + (2527, '抄送流程查询', 'bpm:process-instance-cc:query', 3, 1, 2526, '', '', '', NULL, 0, b'1', b'1', b'1', '1',
  2487 + '2023-01-13 16:14:00', '1', '2023-01-13 16:14:00', b'0'),
  2488 + (2528, '抄送流程创建', 'bpm:process-instance-cc:create', 3, 2, 2526, '', '', '', NULL, 0, b'1', b'1', b'1', '1',
  2489 + '2023-01-13 16:14:00', '1', '2023-01-13 16:14:00', b'0');
2481 2490 COMMIT;
2482 2491  
2483 2492 -- ----------------------------
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
  View file @8f171ba
... ... @@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
5 6 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
  7 +import cn.iocoder.yudao.module.bpm.service.cc.BpmProcessInstanceCopyService;
6 8 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
7 9 import io.swagger.v3.oas.annotations.tags.Tag;
8 10 import io.swagger.v3.oas.annotations.Parameter;
... ... @@ -26,6 +28,9 @@ public class BpmProcessInstanceController {
26 28 @Resource
27 29 private BpmProcessInstanceService processInstanceService;
28 30  
  31 + @Resource
  32 + private BpmProcessInstanceCopyService processInstanceCopyService;
  33 +
29 34 @GetMapping("/my-page")
30 35 @Operation(summary = "获得我的实例分页列表", description = "在【我的流程】菜单中，进行调用")
31 36 @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
... ... @@ -56,4 +61,20 @@ public class BpmProcessInstanceController {
56 61 processInstanceService.cancelProcessInstance(getLoginUserId(), cancelReqVO);
57 62 return success(true);
58 63 }
  64 +
  65 +
  66 + @PostMapping("/cc/create")
  67 + @Operation(summary = "抄送流程")
  68 + @PreAuthorize("@ss.hasPermission('bpm:process-instance-cc:create')")
  69 + public CommonResult<Boolean> createProcessInstanceCC(@Valid @RequestBody BpmProcessInstanceCCReqVO createReqVO) {
  70 + return success(processInstanceCopyService.ccProcessInstance(SecurityFrameworkUtils.getLoginUserId(), createReqVO));
  71 + }
  72 +
  73 + @GetMapping("/cc/my-page")
  74 + @Operation(summary = "获得抄送流程分页列表")
  75 + @PreAuthorize("@ss.hasPermission('bpm:process-instance-cc:query')")
  76 + public CommonResult<PageResult<BpmProcessInstanceCCPageItemRespVO>> getProcessInstanceCCPage(@Valid BpmProcessInstanceCCMyPageReqVO pageReqVO) {
  77 + return success(processInstanceCopyService.getMyProcessInstanceCCPage(SecurityFrameworkUtils.getLoginUserId(), pageReqVO));
  78 + }
  79 +
59 80 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCCMyPageReqVO.java 0 → 100644
  View file @8f171ba
  1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  13 +
  14 +@Schema(description = "管理后台 - 流程实例抄送的分页 Item Response VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class BpmProcessInstanceCCMyPageReqVO extends PageParam {
  19 +
  20 + @Schema(description = "流程名称", example = "芋道")
  21 + private String name;
  22 +
  23 + @Schema(description = "流程编号", example = "123456768")
  24 + private String processInstanceId;
  25 +
  26 + @Schema(description = "创建时间")
  27 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  28 + private LocalDateTime[] createTime;
  29 +
  30 +}
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCCPageItemRespVO.java 0 → 100644
  View file @8f171ba
  1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "管理后台 - 流程实例抄送的分页 Item Response VO")
  9 +@Data
  10 +public class BpmProcessInstanceCCPageItemRespVO {
  11 +
  12 + /**
  13 + * 编号
  14 + */
  15 + @Schema(description = "抄送主键")
  16 + private Long id;
  17 +
  18 + /**
  19 + * 发起人Id
  20 + */
  21 + @Schema(description = "发起人Id")
  22 + private Long startUserId;
  23 +
  24 + @Schema(description = "发起人别名")
  25 + private String startUserNickname;
  26 + /**
  27 + * 表单名
  28 + */
  29 + @Schema(description = "流程实例的名字")
  30 + private String name;
  31 + /**
  32 + * 流程主键
  33 + */
  34 + @Schema(description = "流程实例的主键")
  35 + private String processInstanceId;
  36 +
  37 + @Schema(description = "流程实例的名称")
  38 + private String processInstanceName;
  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 String userNickname;
  55 +
  56 + @Schema(description = "抄送原因")
  57 + private String reason;
  58 +
  59 + @Schema(description = "抄送时间")
  60 + private LocalDateTime createTime;
  61 +}
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCCReqVO.java 0 → 100644
  View file @8f171ba
  1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
  2 +
  3 +import cn.iocoder.yudao.module.bpm.controller.admin.candidate.vo.BpmTaskCandidateRuleVO;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +
  9 +import javax.validation.constraints.NotBlank;
  10 +import javax.validation.constraints.NotEmpty;
  11 +import javax.validation.constraints.NotNull;
  12 +import java.util.Set;
  13 +
  14 +@Schema(description = "管理后台 - 流程实例的抄送 Request VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class BpmProcessInstanceCCReqVO extends BpmTaskCandidateRuleVO {
  19 +
  20 + @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  21 + @NotEmpty(message = "任务编号不能为空")
  22 + private String taskKey;
  23 +
  24 + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  25 + @NotEmpty(message = "任务名称不能为空")
  26 + private String taskName;
  27 +
  28 + @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  29 + @NotEmpty(message = "流程实例的编号不能为空")
  30 + private String processInstanceKey;
  31 +
  32 + @Schema(description = "发起流程的用户的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  33 + @NotNull(message = "发起流程的用户的编号不能为空")
  34 + private Long startUserId;
  35 +
  36 +
  37 + @Schema(description = "任务实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  38 + @NotEmpty(message = "任务实例名称不能为空")
  39 + private String processInstanceName;
  40 +
  41 + @Schema(description = "抄送原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "请帮忙审查下！")
  42 + @NotBlank(message = "抄送原因不能为空")
  43 + private String reason;
  44 +}
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
  View file @8f171ba
... ... @@ -18,7 +18,4 @@ public class BpmTaskApproveReqVO {
18 18 @NotEmpty(message = "审批意见不能为空")
19 19 private String reason;
20 20  
21   - @Schema(description = "审批时流程抄送人", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
22   - private BpmTaskCandidateRuleVO ccCandidateRule;
23   -
24 21 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/cc/BpmProcessInstanceCopyConvert.java
  View file @8f171ba
1 1 package cn.iocoder.yudao.module.bpm.convert.cc;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCPageItemRespVO;
3 6 import cn.iocoder.yudao.module.bpm.dal.dataobject.cc.BpmProcessInstanceCopyDO;
4 7 import cn.iocoder.yudao.module.bpm.service.cc.BpmProcessInstanceCopyVO;
5 8 import org.mapstruct.Mapper;
6 9 import org.mapstruct.factory.Mappers;
7 10  
8 11 import java.util.List;
  12 +import java.util.Map;
9 13  
10 14 /**
11 15 * 动态表单 Convert
... ... @@ -16,10 +20,32 @@ import java.util.List;
16 20 public interface BpmProcessInstanceCopyConvert {
17 21  
18 22 BpmProcessInstanceCopyConvert INSTANCE = Mappers.getMapper(BpmProcessInstanceCopyConvert.class);
  23 +
19 24 BpmProcessInstanceCopyDO copy(BpmProcessInstanceCopyDO bean);
20 25  
21 26 BpmProcessInstanceCopyVO convert(BpmProcessInstanceCopyDO bean);
22 27  
23 28 List<BpmProcessInstanceCopyVO> convertList2(List<BpmProcessInstanceCopyDO> list);
24 29  
  30 + List<BpmProcessInstanceCCPageItemRespVO> convertList(List<BpmProcessInstanceCopyDO> list);
  31 +
  32 + default PageResult<BpmProcessInstanceCCPageItemRespVO> convertPage(PageResult<BpmProcessInstanceCopyDO> page
  33 + , Map<String/* taskId */, String/* taskName */> taskMap
  34 + , Map<String/* processInstaneId */, String/* processInstaneName */> processInstaneMap
  35 + , Map<Long/* userId */, String/* userName */> userMap
  36 + ) {
  37 + List<BpmProcessInstanceCCPageItemRespVO> list = convertList(page.getList());
  38 + for (BpmProcessInstanceCCPageItemRespVO vo:list){
  39 + MapUtils.findAndThen(userMap, vo.getUserId(),
  40 + userName -> vo.setUserNickname(userName));
  41 + MapUtils.findAndThen(userMap, vo.getStartUserId(),
  42 + userName -> vo.setStartUserNickname(userName));
  43 + MapUtils.findAndThen(taskMap, vo.getTaskId(),
  44 + name -> vo.setTaskName(name));
  45 + MapUtils.findAndThen(processInstaneMap, vo.getProcessInstanceId(),
  46 + name -> vo.setProcessInstanceName(name));
  47 + }
  48 + return new PageResult<>(list, page.getTotal());
  49 + }
  50 +
25 51 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/cc/BpmProcessInstanceCopyDO.java
  View file @8f171ba
... ... @@ -31,7 +31,7 @@ public class BpmProcessInstanceCopyDO extends BaseDO {
31 31 */
32 32 private Long startUserId;
33 33 /**
34   - * 表单名
  34 + * 流程名
35 35 */
36 36 private String name;
37 37 /**
... ... @@ -48,5 +48,9 @@ public class BpmProcessInstanceCopyDO extends BaseDO {
48 48 */
49 49 private Long userId;
50 50  
  51 + /**
  52 + * 抄送原因
  53 + */
  54 + private String reason;
51 55  
52 56 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/cc/BpmProcessInstanceCopyMapper.java
  View file @8f171ba
1 1 package cn.iocoder.yudao.module.bpm.dal.mysql.cc;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
3 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCMyPageReqVO;
4 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.cc.BpmProcessInstanceCopyDO;
  8 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
5 9 import org.apache.ibatis.annotations.Mapper;
6 10  
7 11 @Mapper
8 12 public interface BpmProcessInstanceCopyMapper extends BaseMapperX<BpmProcessInstanceCopyDO> {
  13 + default PageResult<BpmProcessInstanceCopyDO> selectPage(Long loginUserId, BpmProcessInstanceCCMyPageReqVO reqVO){
  14 + return selectPage(reqVO, new LambdaQueryWrapperX<BpmProcessInstanceCopyDO>()
  15 + .eqIfPresent(BpmProcessInstanceCopyDO::getUserId, loginUserId)
  16 + .eqIfPresent(BpmProcessInstanceCopyDO::getProcessInstanceId, reqVO.getProcessInstanceId())
  17 + .likeIfPresent(BpmProcessInstanceCopyDO::getName, reqVO.getName())
  18 + .betweenIfPresent(BpmProcessInstanceCopyDO::getCreateTime, reqVO.getCreateTime())
  19 + .orderByDesc(BpmProcessInstanceCopyDO::getId));
  20 + }
9 21 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
  View file @8f171ba
... ... @@ -36,6 +36,10 @@ public class BpmCandidateSourceInfo {
36 36 @Schema(description = "发起抄送的用户")
37 37 private String creator;
38 38  
  39 + @Schema(description = "抄送原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "请帮忙审查下！")
  40 + @NotEmpty(message = "抄送原因不能为空")
  41 + private String reason;
  42 +
39 43 public void addRule(BpmTaskCandidateRuleVO vo) {
40 44 assert vo != null;
41 45 if (rules == null) {
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChain.java
  View file @8f171ba
... ... @@ -48,7 +48,9 @@ public class BpmCandidateSourceInfoProcessorChain {
48 48 for (BpmCandidateSourceInfoProcessor processor : processorList) {
49 49 try {
50 50 for (BpmTaskCandidateRuleVO vo : sourceInfo.getRules()) {
51   - processor.validRuleOptions(vo.getType(), vo.getOptions());
  51 + if (CollUtil.contains(processor.getSupportedTypes(), vo.getType())) {
  52 + processor.validRuleOptions(vo.getType(), vo.getOptions());
  53 + }
52 54 }
53 55 } catch (Exception e) {
54 56 e.printStackTrace();
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyService.java
  View file @8f171ba
1 1 package cn.iocoder.yudao.module.bpm.service.cc;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCMyPageReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCPageItemRespVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCReqVO;
3 7 import cn.iocoder.yudao.module.bpm.service.candidate.BpmCandidateSourceInfo;
4 8  
5 9 /**
... ... @@ -23,4 +27,20 @@ public interface BpmProcessInstanceCopyService {
23 27 * @return
24 28 */
25 29 boolean makeCopy(BpmCandidateSourceInfo sourceInfo);
  30 +
  31 + /**
  32 + * 流程实例的抄送
  33 + * @param loginUserId 当前登录用户
  34 + * @param createReqVO 创建的抄送请求
  35 + * @return 是否抄送成功，抄送成功则返回true
  36 + */
  37 + boolean ccProcessInstance(Long loginUserId, BpmProcessInstanceCCReqVO createReqVO);
  38 +
  39 + /**
  40 + * 抄送的流程
  41 + * @param loginUserId 登录用户id
  42 + * @param pageReqVO 分页请求
  43 + * @return 抄送的分页结果
  44 + */
  45 + PageResult<BpmProcessInstanceCCPageItemRespVO> getMyProcessInstanceCCPage(Long loginUserId, BpmProcessInstanceCCMyPageReqVO pageReqVO);
26 46 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceImpl.java
  View file @8f171ba
1 1 package cn.iocoder.yudao.module.bpm.service.cc;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCMyPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCPageItemRespVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCCReqVO;
4 8 import cn.iocoder.yudao.module.bpm.convert.cc.BpmProcessInstanceCopyConvert;
5 9 import cn.iocoder.yudao.module.bpm.dal.dataobject.cc.BpmProcessInstanceCopyDO;
6 10 import cn.iocoder.yudao.module.bpm.dal.mysql.cc.BpmProcessInstanceCopyMapper;
7 11 import cn.iocoder.yudao.module.bpm.service.candidate.BpmCandidateSourceInfo;
8 12 import cn.iocoder.yudao.module.bpm.service.candidate.BpmCandidateSourceInfoProcessorChain;
9 13 import cn.iocoder.yudao.module.bpm.service.cc.dto.BpmDelegateExecutionDTO;
  14 +import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
10 15 import cn.iocoder.yudao.module.bpm.util.FlowableUtils;
  16 +import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
  17 +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
11 18 import lombok.extern.slf4j.Slf4j;
12 19 import org.flowable.engine.RuntimeService;
13 20 import org.flowable.engine.delegate.DelegateExecution;
14 21 import org.flowable.engine.runtime.ProcessInstance;
  22 +import org.springframework.context.annotation.Lazy;
15 23 import org.springframework.stereotype.Service;
16 24 import org.springframework.validation.annotation.Validated;
17 25  
18 26 import javax.annotation.Resource;
19 27 import java.time.LocalDateTime;
20   -import java.util.ArrayList;
21   -import java.util.List;
22   -import java.util.Set;
  28 +import java.util.*;
  29 +import java.util.stream.Collectors;
23 30  
24 31 @Slf4j
25 32 @Service
... ... @@ -40,6 +47,12 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
40 47 @Resource
41 48 private BpmCandidateSourceInfoProcessorChain processorChain;
42 49  
  50 + @Resource
  51 + @Lazy // 解决循环依赖
  52 + private BpmTaskService taskService;
  53 + @Resource
  54 + private AdminUserApi adminUserApi;
  55 +
43 56 @Override
44 57 public BpmProcessInstanceCopyVO queryById(Long copyId) {
45 58 BpmProcessInstanceCopyDO bpmProcessInstanceCopyDO = processInstanceCopyMapper.selectById(copyId);
... ... @@ -60,7 +73,7 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
60 73 } else {
61 74 BpmProcessInstanceCopyDO copyDO = new BpmProcessInstanceCopyDO();
62 75 // 调用
63   - //设置任务id
  76 + // 设置任务id
64 77 copyDO.setTaskId(sourceInfo.getTaskId());
65 78 copyDO.setProcessInstanceId(sourceInfo.getProcessInstanceId());
66 79 ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
... ... @@ -72,6 +85,7 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
72 85 }
73 86 copyDO.setStartUserId(FlowableUtils.getStartUserIdFromProcessInstance(processInstance));
74 87 copyDO.setName(FlowableUtils.getFlowName(processInstance.getProcessDefinitionId()));
  88 + copyDO.setReason(sourceInfo.getReason());
75 89 copyDO.setCreator(sourceInfo.getCreator());
76 90 copyDO.setCreateTime(LocalDateTime.now());
77 91 List<BpmProcessInstanceCopyDO> copyList = new ArrayList<>(ccCandidates.size());
... ... @@ -84,9 +98,50 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy
84 98 }
85 99 }
86 100  
87   - public List<BpmProcessInstanceCopyVO> queryByProcessId() {
88   - return null;
  101 + @Override
  102 + public boolean ccProcessInstance(Long loginUserId, BpmProcessInstanceCCReqVO reqVO) {
  103 + // 在能正常审批的情况下抄送流程
  104 + BpmCandidateSourceInfo sourceInfo = new BpmCandidateSourceInfo();
  105 + sourceInfo.setTaskId(reqVO.getTaskKey());
  106 + sourceInfo.setProcessInstanceId(reqVO.getProcessInstanceKey());
  107 + sourceInfo.addRule(reqVO);
  108 + sourceInfo.setCreator(String.valueOf(loginUserId));
  109 + sourceInfo.setReason(reqVO.getReason());
  110 + if (!makeCopy(sourceInfo)) {
  111 + throw new RuntimeException("抄送任务失败");
  112 + }
  113 + return false;
89 114 }
90 115  
  116 + //获取流程抄送分页
  117 + @Override
  118 + public PageResult<BpmProcessInstanceCCPageItemRespVO> getMyProcessInstanceCCPage(Long loginUserId, BpmProcessInstanceCCMyPageReqVO pageReqVO) {
  119 + // 通过 BpmProcessInstanceExtDO 表，先查询到对应的分页
  120 + PageResult<BpmProcessInstanceCopyDO> pageResult = processInstanceCopyMapper.selectPage(loginUserId, pageReqVO);
  121 + if (CollUtil.isEmpty(pageResult.getList())) {
  122 + return new PageResult<>(pageResult.getTotal());
  123 + }
  124 +
  125 + Set<String/* taskId */> taskIds = new HashSet<>();
  126 + Set<String/* processInstaneId */> processInstaneIds = new HashSet<>();
  127 + Set<Long/* userId */> userIds = new HashSet<>();
  128 + for (BpmProcessInstanceCopyDO doItem : pageResult.getList()) {
  129 + taskIds.add(doItem.getTaskId());
  130 + processInstaneIds.add(doItem.getProcessInstanceId());
  131 + userIds.add(doItem.getStartUserId());
  132 + Long userId = Long.valueOf(doItem.getCreator());
  133 + userIds.add(userId);
  134 + doItem.setUserId(userId);
  135 + }
  136 +
  137 + Map<String, String> taskNameByTaskIds = FlowableUtils.getTaskNameByTaskIds(taskIds);
  138 + Map<String, String> processInstanceNameByTaskIds = FlowableUtils.getProcessInstanceNameByTaskIds(processInstaneIds);
  139 +
  140 + Map<Long, String> userMap = adminUserApi.getUserList(userIds).stream().collect(Collectors.toMap(
  141 + AdminUserRespDTO::getId, AdminUserRespDTO::getNickname));
  142 +
  143 + // 转换返回
  144 + return BpmProcessInstanceCopyConvert.INSTANCE.convertPage(pageResult, taskNameByTaskIds, processInstanceNameByTaskIds, userMap);
  145 + }
91 146  
92 147 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyVO.java
  View file @8f171ba
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
  7 +import java.time.LocalDateTime;
7 8 import java.util.Date;
8 9  
9 10  
... ... @@ -27,6 +28,9 @@ public class BpmProcessInstanceCopyVO {
27 28 */
28 29 @Schema(description = "发起人Id")
29 30 private Long startUserId;
  31 +
  32 + @Schema(description = "发起人别名")
  33 + private String startUserNickname;
30 34 /**
31 35 * 表单名
32 36 */
... ... @@ -38,14 +42,24 @@ public class BpmProcessInstanceCopyVO {
38 42 @Schema(description = "流程实例的主键")
39 43 private String processInstanceId;
40 44  
  45 + @Schema(description = "流程实例的名字")
  46 + private String processInstanceName;
  47 +
41 48 /**
42 49 * 任务主键
43 50 */
44 51 @Schema(description = "发起抄送的任务编号")
45 52 private String taskId;
  53 +
46 54 /**
47 55 * 用户主键
48 56 */
49 57 @Schema(description = "用户编号")
50 58 private Long userId;
  59 +
  60 + @Schema(description = "用户别名")
  61 + private Long userNickname;
  62 +
  63 + @Schema(description = "抄送时间")
  64 + private LocalDateTime createTime;
51 65 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
  View file @8f171ba
... ... @@ -242,18 +242,6 @@ public class BpmTaskServiceImpl implements BpmTaskService {
242 242 .setReason(reqVO.getReason()));
243 243 // 处理加签任务
244 244 handleParentTask(task);
245   -
246   - // 在能正常审批的情况下抄送流程
247   - if (null != reqVO.getCcCandidateRule()) {
248   - BpmCandidateSourceInfo sourceInfo = new BpmCandidateSourceInfo();
249   - sourceInfo.setTaskId(reqVO.getId());
250   - sourceInfo.setProcessInstanceId(instance.getId());
251   - sourceInfo.addRule(reqVO.getCcCandidateRule());
252   - sourceInfo.setCreator(String.valueOf(userId));
253   - if (!processInstanceCopyService.makeCopy(sourceInfo)) {
254   - throw new RuntimeException("抄送任务失败");
255   - }
256   - }
257 245 }
258 246  
259 247  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/util/FlowableUtils.java
  View file @8f171ba
1 1 package cn.iocoder.yudao.module.bpm.util;
2 2  
3 3  
  4 +import cn.hutool.core.collection.CollUtil;
4 5 import cn.hutool.extra.spring.SpringUtil;
5 6 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
6 7 import org.flowable.bpmn.model.BpmnModel;
... ... @@ -9,11 +10,12 @@ import org.flowable.bpmn.model.FlowElement;
9 10 import org.flowable.bpmn.model.FlowNode;
10 11 import org.flowable.engine.RepositoryService;
11 12 import org.flowable.engine.RuntimeService;
  13 +import org.flowable.engine.TaskService;
12 14 import org.flowable.engine.repository.ProcessDefinition;
13 15 import org.flowable.engine.runtime.ProcessInstance;
  16 +import org.flowable.task.api.Task;
14 17  
15   -import java.util.List;
16   -import java.util.Map;
  18 +import java.util.*;
17 19  
18 20 /**
19 21 * 流程引擎工具类封装
... ... @@ -47,9 +49,9 @@ public class FlowableUtils {
47 49 RuntimeService runtimeService = SpringUtil.getBean(RuntimeService.class);
48 50 RepositoryService repositoryService = SpringUtil.getBean(RepositoryService.class);
49 51  
50   - String definitionld = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult().getProcessDefinitionId(); //获取bpm（模型）对象
  52 + String definitionld = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult().getProcessDefinitionId(); // 获取bpm（模型）对象
51 53 BpmnModel bpmnModel = repositoryService.getBpmnModel(definitionld);
52   - //传节点定义key获取当前节点
  54 + // 传节点定义key获取当前节点
53 55 FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(nodeId);
54 56 return flowNode;
55 57 }
... ... @@ -75,4 +77,44 @@ public class FlowableUtils {
75 77 return NumberUtils.parseLong(instance.getStartUserId());
76 78 }
77 79  
  80 + public static String getTaskNameByTaskId(String taskId) {
  81 + TaskService taskService = SpringUtil.getBean(TaskService.class);
  82 + Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
  83 + return task.getName();
  84 + }
  85 +
  86 + public static Map<String/* taskId */, String/* taskName */> getTaskNameByTaskIds(Collection<String> taskIds) {
  87 + TaskService taskService = SpringUtil.getBean(TaskService.class);
  88 + List<Task> tasks = taskService.createTaskQuery().taskIds(taskIds).list();
  89 + if (CollUtil.isNotEmpty(tasks)) {
  90 + Map<String/* taskId */, String/* taskName */> taskMap = new HashMap<>(tasks.size());
  91 + for (Task task : tasks) {
  92 + taskMap.putIfAbsent(task.getId(), task.getName());
  93 + }
  94 + return taskMap;
  95 + }
  96 + return Collections.emptyMap();
  97 + }
  98 +
  99 + public static String getProcessInstanceNameByTaskId(String processInstanceId) {
  100 + RuntimeService runtimeService = SpringUtil.getBean(RuntimeService.class);
  101 + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
  102 + .processInstanceId(processInstanceId)
  103 + .singleResult();
  104 + return processInstance.getName();
  105 + }
  106 +
  107 + public static Map<String/* processInstaneId */, String/* processInstaneName */> getProcessInstanceNameByTaskIds(Set<String> taskIds) {
  108 + RuntimeService runtimeService = SpringUtil.getBean(RuntimeService.class);
  109 + List<ProcessInstance> processInstances = runtimeService.createProcessInstanceQuery().processInstanceIds(taskIds).list();
  110 + if (CollUtil.isNotEmpty(processInstances)) {
  111 + Map<String/* processInstaneId */, String/* processInstaneName */> processInstaneMap = new HashMap<>(processInstances.size());
  112 + for (ProcessInstance processInstance : processInstances) {
  113 + processInstaneMap.putIfAbsent(processInstance.getId(), processInstance.getName());
  114 + }
  115 + return processInstaneMap;
  116 + }
  117 + return Collections.emptyMap();
  118 + }
  119 +
78 120 }
... ...