Commit 1c508add9235c1f0b7b8fb567ba69cb8c36d2595

Authored by YunaiV
1 parent b5cd0a5e

review:【bpm 工作流】流程打印

yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java
@@ -7,13 +7,13 @@ import lombok.Data; @@ -7,13 +7,13 @@ import lombok.Data;
7 import java.util.List; 7 import java.util.List;
8 import java.util.Map; 8 import java.util.Map;
9 9
10 -// TODO @lesan:这个可能复用 BpmApprovalDetailRespVO 哇?@芋艿:暂时先这样吧,BpmApprovalDetailRespVO 太大了。。。  
11 @Schema(description = "管理后台 - 流程实例的打印数据 Response VO") 10 @Schema(description = "管理后台 - 流程实例的打印数据 Response VO")
12 @Data 11 @Data
13 public class BpmProcessPrintDataRespVO { 12 public class BpmProcessPrintDataRespVO {
14 13
15 private Boolean printTemplateEnable; 14 private Boolean printTemplateEnable;
16 15
  16 + // TODO @lesan:要不 processStatus、processInstanceId、processBusinessKey、processBusinessKey、startUser、endTime、processVariables 使用 BpmProcessInstanceRespVO ?虽然这个 VO 大了点,但是收一收字段。嘿嘿;进而只有 processInstance、tasks、formFields、printTemplateHtml 这些字段;
17 private Integer processStatus; 17 private Integer processStatus;
18 18
19 private String processInstanceId; 19 private String processInstanceId;
@@ -28,6 +28,7 @@ public class BpmProcessPrintDataRespVO { @@ -28,6 +28,7 @@ public class BpmProcessPrintDataRespVO {
28 28
29 private String endTime; 29 private String endTime;
30 30
  31 + // TODO @lesan:变量要不改成 tasks;
31 private List<ApproveNode> approveNodes; 32 private List<ApproveNode> approveNodes;
32 33
33 private List<String> formFields; 34 private List<String> formFields;
@@ -36,6 +37,7 @@ public class BpmProcessPrintDataRespVO { @@ -36,6 +37,7 @@ public class BpmProcessPrintDataRespVO {
36 37
37 private Map<String, Object> processVariables; 38 private Map<String, Object> processVariables;
38 39
  40 + // TODO @lesan:类名要不要改成 tasks ?然后 id、name、signUrl、description;感觉理解成本低点;
39 @Data 41 @Data
40 public static class ApproveNode { 42 public static class ApproveNode {
41 43
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -728,6 +728,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -728,6 +728,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
728 userMap, deptMap); 728 userMap, deptMap);
729 } 729 }
730 730
  731 + // TODO @lesan:这个可以放在 controller + convert 哇?保证 Service 只尽量处理写逻辑;
731 @Override 732 @Override
732 public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) { 733 public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) {
733 // 1 数据准备 734 // 1 数据准备
@@ -756,7 +757,6 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -756,7 +757,6 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
756 DeptRespDTO dept = deptApi.getDept(startUser.getDeptId()); 757 DeptRespDTO dept = deptApi.getDept(startUser.getDeptId());
757 printData.setStartUser(new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName())); 758 printData.setStartUser(new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName()));
758 // 2.4 审批历史 759 // 2.4 审批历史
759 - // TODO @lesan:打印的时候,未来节点打印么? @芋艿:只打印已完成的任务  
760 List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery() 760 List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
761 .finished() 761 .finished()
762 .includeTaskLocalVariables() 762 .includeTaskLocalVariables()