From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java | 77 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java
index b4c89a1..74c3c7a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/BatchDispatchService.java
@@ -7,10 +7,13 @@
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
@@ -32,6 +35,10 @@
private TaskService taskService;
@Autowired
private RuntimeService runtimeService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+ @Autowired
+ private UserCommonService userCommonService;
@Transactional
public void batchDispatchTask(BatchDispatchVO batchDispatchVO) {
//String[] taskIds, String[] processInstanceIds, String comment, String assignee
@@ -51,16 +58,19 @@
taskId = taskIds[i];
processInstanceId = batchDispatchVO.getProcessInstanceIds()[i];
- Task task = taskService.createTaskQuery()
- .taskId(taskId)
- .singleResult();
- taskService.complete(taskId, variables);
+ runtimeService.setVariable(processInstanceId,FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(batchDispatchVO.getAssignee())));
+ Task task = getTask(taskId);
+
+ if(!task.getTaskDefinitionKey().equals("teamLeaderTask")){
+ throw new ServiceException("闈瀃浠诲姟鍒嗘淳]鑺傜偣鐨勪换鍔′笉鑳芥壒閲忔淳宸�");
+ }
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
-
approveRecordService.saveApproveRecords(task,FlowContants.Y,comment);
+
+ taskService.complete(taskId, variables);
}
}
@@ -86,19 +96,31 @@
taskId = taskIds[i];
processInstanceId = batchDispatchVO.getProcessInstanceIds()[i];
- variables.put("assignee", getAutoProgrammer(processInstanceId));
+ Task task = getTask(taskId);
+ if(!task.getTaskDefinitionKey().equals("teamLeaderTask")){
+ throw new ServiceException("闈瀃浠诲姟鍒嗘淳]鑺傜偣鐨勪换鍔′笉鑳芥壒閲忔淳宸�");
+ }
- Task task = taskService.createTaskQuery()
- .taskId(taskId)
- .singleResult();
- taskService.complete(taskId, variables);
+ Object programmerId = getAutoProgrammer(processInstanceId);
+ variables.put("assignee", programmerId);
+
+ runtimeService.setVariable(processInstanceId,FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(programmerId)));
+
if (StringUtil.isNoneBlank(processInstanceId, batchDispatchVO.getComment())) {
taskService.addComment(taskId, processInstanceId, batchDispatchVO.getComment());
}
-
approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());
+
+ //鏈�鍚庝竴姝ュ畬鎴�
+ taskService.complete(taskId, variables);
}
+ }
+
+ private Task getTask(String taskId) {
+ return taskService.createTaskQuery()
+ .taskId(taskId)
+ .singleResult();
}
/**
@@ -107,7 +129,7 @@
* @return
*/
Object getAutoProgrammer(String processInstanceId){
- ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables()
.processInstanceId(processInstanceId)
.singleResult();
Object programmer = processInstance.getProcessVariables().get(FlowContants.PROGRAMMER);
@@ -123,7 +145,6 @@
*/
@Transactional
public void batchApprove(BatchDispatchVO batchDispatchVO) {
- //TODO 寰呭疄鐜�
checkBatchParameter(batchDispatchVO);
String[] taskIds = batchDispatchVO.getTaskIds();
String taskId;
@@ -132,24 +153,42 @@
//瀹℃壒缁撴灉鍜屽鐞嗕汉閮戒竴鏍风殑
Map<String, Object> variables = Kv.create();
variables.put(FlowVariableContants.APPROVE, batchDispatchVO.getApprove());
- variables.put(FlowVariableContants.ASSIGNEE, batchDispatchVO.getAssignee());
variables.put(FlowVariableContants.COMMENT, batchDispatchVO.getComment());
+
for(int i=0;i<taskIds.length;i++) {
taskId = taskIds[i];
processInstanceId = batchDispatchVO.getProcessInstanceIds()[i];
- Task task = taskService.createTaskQuery()
- .taskId(taskId)
- .singleResult();
- taskService.complete(taskId, variables);
+ Task task = getTask(taskId);
if (StringUtil.isNoneBlank(processInstanceId, batchDispatchVO.getComment())) {
taskService.addComment(taskId, processInstanceId, batchDispatchVO.getComment());
}
+ if(FlowContants.N.equals(batchDispatchVO.getApprove())) {
+ //椹冲洖锛屾煡璇㈠疄闄呯紪绋嬩汉鍛� 椹冲洖
+ variables.put(FlowVariableContants.ASSIGNEE, getActualProgrammer(processInstanceId));
+ }
+ //approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());
- approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());
+ taskService.complete(taskId, variables);
}
}
+
+ /**
+ * 鑾峰彇娴佺▼鎵ц涓疄闄呯殑缂栫▼浜哄憳锛堟墽琛屼笂浼犳枃浠剁殑浜猴級
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 缂栫▼浜哄憳id
+ */
+ Object getActualProgrammer(String processInstanceId){
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+ Object actProgrammer = processInstance.getProcessVariables().get(FlowVariableContants.ACT_PROGRAMMER);
+ if(actProgrammer == null){
+ throw new ServiceException(processInstance.getProcessVariables().get(FlowContants.TITLE)+":鏈壘鍒扮紪绋嬩汉鍛�");
+ }
+ return actProgrammer;
+ }
/**
* 楠岃瘉鎵归噺澶勭悊鍙傛暟
* @param batchDispatchVO 鎵归噺澶勭悊鍙傛暟瀵硅薄
--
Gitblit v1.9.3