github/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2026-04-19 14:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YunaiV
2025-09-04 22:53:16 +08:00
parent b5cd0a5e38
commit 1c508add92
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java
View File

@@ -7,13 +7,13 @@ import lombok.Data;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
// TODO @lesan：这个可能复用 BpmApprovalDetailRespVO 哇？@芋艿：暂时先这样吧，BpmApprovalDetailRespVO 太大了。。。
@Schema(description = "管理后台 - 流程实例的打印数据 Response VO") @Schema(description = "管理后台 - 流程实例的打印数据 Response VO")
@Data @Data
public class BpmProcessPrintDataRespVO { public class BpmProcessPrintDataRespVO {
private Boolean printTemplateEnable; private Boolean printTemplateEnable;
// TODO @lesan：要不 processStatus、processInstanceId、processBusinessKey、processBusinessKey、startUser、endTime、processVariables 使用 BpmProcessInstanceRespVO ？虽然这个 VO 大了点，但是收一收字段。嘿嘿；进而只有 processInstance、tasks、formFields、printTemplateHtml 这些字段；
private Integer processStatus; private Integer processStatus;
private String processInstanceId; private String processInstanceId;
@@ -28,6 +28,7 @@ public class BpmProcessPrintDataRespVO {
private String endTime; private String endTime;
// TODO @lesan：变量要不改成 tasks；
private List<ApproveNode> approveNodes; private List<ApproveNode> approveNodes;
private List<String> formFields; private List<String> formFields;
@@ -36,6 +37,7 @@ public class BpmProcessPrintDataRespVO {
private Map<String, Object> processVariables; private Map<String, Object> processVariables;
// TODO @lesan：类名要不要改成 tasks ？然后 id、name、signUrl、description；感觉理解成本低点；
@Data @Data
public static class ApproveNode { public static class ApproveNode {

2
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
View File

@@ -728,6 +728,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
userMap, deptMap); userMap, deptMap);
} }
// TODO @lesan：这个可以放在 controller + convert 哇？保证 Service 只尽量处理写逻辑；
@Override @Override
public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) { public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) {
// 1 数据准备 // 1 数据准备
@@ -756,7 +757,6 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
DeptRespDTO dept = deptApi.getDept(startUser.getDeptId()); DeptRespDTO dept = deptApi.getDept(startUser.getDeptId());
printData.setStartUser(new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName())); printData.setStartUser(new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName()));
// 2.4 审批历史 // 2.4 审批历史
// TODO @lesan：打印的时候，未来节点打印么？ @芋艿：只打印已完成的任务
List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery() List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
.finished() .finished()
.includeTaskLocalVariables() .includeTaskLocalVariables()