From b4d10ff7535002dddb63a0b28ddb37fee7ed1e9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 十二月 2025 16:30:53 +0800
Subject: [PATCH] 增加pdf，xlsx，docx文件预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/thirdpart/service/MesTaskService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 f8491a4..d3cf586 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
@@ -4,7 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
-import org.springblade.mdm.flow.constants.FlowVariableContants;
+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;
@@ -40,6 +40,7 @@
if(isDuplicate){
taskDispatch.setStatus(TaskDispatch.STATUS_DUP);
}
+ taskDispatch.setTenantId("000000");
taskDispatchService.save(taskDispatch);
taskDispatchService.addDrawingNos(taskDispatch.getDrawingNo());
@@ -48,20 +49,28 @@
/**
* mes 瀹屾垚鎺ㄩ��
- * @param finishTaskVO
+ * @param finishTaskVO mes瀹屽伐鏁版嵁
*/
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());
+ if(finishTaskVO.getInspector() != null) {
+ taskDispatch.setInspector(finishTaskVO.getInspector());
+ }
+ if(finishTaskVO.getOperationFeedbackTime() != null){
+ taskDispatch.setOperateTime(finishTaskVO.getOperationFeedbackTime());
+ }
+
+ if(finishTaskVO.getAcruslEndTime() !=null ) {
+ taskDispatch.setCheckTime(finishTaskVO.getAcruslEndTime());
+ }
taskDispatchService.updateById(taskDispatch);
ProcessInstance inst = runtimeService.createProcessInstanceQuery()
.processInstanceId(taskDispatch.getProcessInstanceId()).active().singleResult();
if(inst != null){
- runtimeService.setVariable(taskDispatch.getProcessInstanceId(), FlowVariableContants.PROCESS_CARD,finishTaskVO.getProcessCard());
+ runtimeService.setVariable(taskDispatch.getProcessInstanceId(), FlowVariableConstant.PROCESS_CARD,finishTaskVO.getProcessCard());
}
}
--
Gitblit v1.9.3