From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/CureFinishOperateTask.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/CureFinishOperateTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/CureFinishOperateTask.java
index 7aa82e7..93406eb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/CureFinishOperateTask.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/CureFinishOperateTask.java
@@ -2,53 +2,31 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
import org.flowable.engine.delegate.DelegateExecution;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.model.BladeFile;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.commons.contants.ParamConstants;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.mdm.flow.excution.dispatch.FinishDataHandler;
+import org.springblade.mdm.flow.excution.events.CureFinishedEvent;
import org.springblade.mdm.flow.service.FlowCommonService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.service.NcNodeAutoCreateService;
+import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.ProgramAnnotationService;
-import org.springblade.system.feign.ISysClient;
-import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDate;
-import java.util.Arrays;
import java.util.Date;
-import java.util.List;
@Slf4j
@Component("cureFinishOperateTask")
@AllArgsConstructor
public class CureFinishOperateTask {
private final NcNodeService nodeService;
- private final NcNodeAutoCreateService ncNodeAutoCreateService;
+ private final NcNodeHisService nodeHisService;
private final FlowCommonService flowCommonService;
- private final FlowProgramFileService flowProgramFileService;
- private final ISysClient sysClient;
- private final OssTemplate ossTemplate;
-
-
private final NormalCureFinishDataHandler normalCureFinishDataHandler;
private final DeviationCureFinishDataHandler deviationCureFinishDataHandler;
-
- private final NcNodeService ncNodeService;
/**
* 鍥哄寲瀹℃壒閫氳繃澶勭悊浠诲姟锛�
@@ -58,8 +36,20 @@
@Transactional
public void execute(DelegateExecution execution) throws IOException {
log.info("鎵ц鍥哄寲绋嬪簭浠诲姟鏈嶅姟,娴佺▼瀹炰緥id={}", execution.getProcessInstanceId());
+ Date time = DateUtil.now();
//鍥哄寲绋嬪簭妫�鏌ユ湁鏁堟湡锛�
- dealWithNode(execution.getProcessInstanceId());
+ NcNode node = dealWithNode(execution.getProcessInstanceId());
+
+ nodeHisService.mergeNodeToHisGeTime(time);
+
+ publishEvent(node.getProgramNo());
+
+ }
+
+ void publishEvent(String programNo) {
+ //TaskDispatch dispatch = taskDispatchService.getByProgramNo(programNo);
+ CureFinishedEvent event = new CureFinishedEvent("curefinish",programNo);
+ SpringUtil.publishEvent(event);
}
/**
@@ -67,13 +57,14 @@
*
* @param processInstanceId 娴佺▼瀹炰緥id
*/
- void dealWithNode(String processInstanceId) throws IOException {
+ NcNode dealWithNode(String processInstanceId) throws IOException {
//绋嬪簭鍖呰妭鐐瑰拰涓嬪睘绋嬪簭鑺傜偣(鍖呮嫭鍘嗗彶鑺傜偣闈炴渶鏂扮増鏈殑)浠庤瘯鍒囨尓鍒板浐鍖栦笅闈�
//绋嬪簭鍖呰妭鐐� 璁剧疆鏈凡鍥哄寲
NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId, processInstanceId).one();
FlowProgramProperties flowProps = flowCommonService.getProgramProperties(processInstanceId);
getDataHandler(pkgNode).handleData(flowProps);
+ return pkgNode;
}
/**
@@ -89,8 +80,4 @@
}
}
-
-
-
-
}
--
Gitblit v1.9.3