From 71a55d8d0d886eb6e489a7b581eb799f3a8ad054 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 23 七月 2025 22:46:00 +0800
Subject: [PATCH] 增加流程列表中 “文件”列的显示方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index 78da526..6acabc6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -4,6 +4,7 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
@@ -67,22 +68,29 @@
* @param prog 鏁版帶绋嬪簭瀹炰綋
*/
public void startOne(NcProgram prog){
- Map<String, Object> vars = new HashMap<>();
- //NcProgram prog = programs.get(0);
- Machine machine = machineService.getByCode(prog.getMachineCode());
- vars.put("machineCode",prog.getMachineCode());
- vars.put("machineMode",machine.getName());
- vars.put("processEdition",prog.getProcessEdition());
-
- //璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
+ Map<String, Object> vars = null;
+ //璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
- //鑾峰彇瀹℃壒鐢ㄦ埛
- List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(preRef.getProcessInstanceId())
- .orderByHistoricTaskInstanceEndTime().desc()
- .list();
+ if(preRef != null) {
+ //鑾峰彇瀹℃壒鐢ㄦ埛
+ /*
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
+ .processInstanceId(preRef.getProcessInstanceId())
+ .orderByHistoricTaskInstanceEndTime().desc()
+ .list();*/
+ HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
+ .processInstanceId(preRef.getProcessInstanceId()).includeProcessVariables()
+ .singleResult();
+ if(instance != null) {//浣跨敤浠诲姟娲惧伐娴佺▼鐨勫彉閲�
+ vars = new HashMap<>(instance.getProcessVariables());
+ }
+ }
+ if(vars == null){
+ vars = new HashMap<>();
+ }
+ /*
String programmer = null;
String checker = null;
String senior = null;
@@ -100,10 +108,10 @@
senior = task.getAssignee();
}
- }
- vars.put("programmer",programmer);
- vars.put("checker",checker);
- vars.put("senior",senior);
+ }*/
+ //vars.put("programmer",programmer);
+ //vars.put("checker",checker);
+ //vars.put("senior",senior);
String businessKey = "0";//涓氬姟琛╧ey
@@ -115,7 +123,6 @@
ref.setNcProgramId(prog.getId());
processProgRefService.save(ref);
-
}
/**
--
Gitblit v1.9.3