From edecbd9cb1b31ded46b8592634780d999db6b6f0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 14:19:21 +0800
Subject: [PATCH] 文件下发，回传文件处理的查看下载
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java
index d94029d..dd224fa 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java
@@ -3,7 +3,8 @@
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
-import org.springblade.mdm.flow.constants.FlowVariableContants;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
@@ -39,6 +40,7 @@
if(isDuplicate){
taskDispatch.setStatus(TaskDispatch.STATUS_DUP);
}
+ taskDispatch.setTenantId("000000");
taskDispatchService.save(taskDispatch);
taskDispatchService.addDrawingNos(taskDispatch.getDrawingNo());
@@ -50,14 +52,19 @@
* @param finishTaskVO
*/
public void finishTask(MesTaskFinishVO finishTaskVO) {
- TaskDispatch taskDispatch = taskDispatchService.getByMesTaskId(finishTaskVO.getMesTaskId());
+ TaskDispatch taskDispatch = taskDispatchService.getByOperationId(finishTaskVO.getOperationId());
if(taskDispatch != null && taskDispatch.getProcessInstanceId() != null){
taskDispatch.setProcessCard(finishTaskVO.getProcessCard());
taskDispatch.setInspector(finishTaskVO.getInspector());
- taskDispatch.setCheckTime(finishTaskVO.getCheckTime());
+ taskDispatch.setCheckTime(finishTaskVO.getAcruslEndEime());
taskDispatchService.updateById(taskDispatch);
- runtimeService.setVariable(taskDispatch.getProcessInstanceId(), FlowVariableContants.PROCESS_CARD,finishTaskVO.getProcessCard());
+ ProcessInstance inst = runtimeService.createProcessInstanceQuery()
+ .processInstanceId(taskDispatch.getProcessInstanceId()).active().singleResult();
+ if(inst != null){
+ runtimeService.setVariable(taskDispatch.getProcessInstanceId(), FlowVariableConstant.PROCESS_CARD,finishTaskVO.getProcessCard());
+ }
+
}
}
}
--
Gitblit v1.9.3