From 34428bd30b004336f9ebc93de0ebe8fae65017c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 27 十一月 2025 14:09:30 +0800
Subject: [PATCH] 审批界面增加pdf，图片预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
index c4bb669..45ef0b2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/DeviationCureFinishDataHandler.java
@@ -19,7 +19,7 @@
import java.util.List;
/**
- * 鍋忕鍗曞浐鍖栧畬鎴愭暟鎹鐞嗗櫒锛屽姛鑳斤細姊崇悊鏍戣妭鐐�
+ * 涓存椂鏇存敼鍗曞浐鍖栧畬鎴愭暟鎹鐞嗗櫒锛屽姛鑳斤細姊崇悊鏍戣妭鐐�
*/
@Slf4j
@Component("deviationCureFinishDataHandler")
@@ -29,21 +29,15 @@
private FlowProgramFileService flowProgramFileService;
@Autowired
private NcNodeService nodeService;
- @Autowired
- private NcNodeAutoCreateService ncNodeAutoCreateService;
- @Autowired
- private MachineService machineService;
/**
- * cureFinishOperateTask璋冪敤锛屽亸绂诲崟鍥炰紶瀹℃壒瀹屾垚澶勭悊涓氬姟
+ * cureFinishOperateTask璋冪敤锛屼复鏃舵洿鏀瑰崟鍥炰紶瀹℃壒瀹屾垚澶勭悊涓氬姟
* @param props 灞炴��
*/
public void handleData(FlowProgramProperties props) {
// 鎵ц涓氬姟閫昏緫
- String instId = props.getProcessInstanceId();
NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId, props.getProcessInstanceId()).one();
-
- pkgNode.lock();
+ pkgNode.lock("涓存椂鏇存敼鍗曞洖浼犻攣瀹�");
pkgNode.setIsLastEdition(0);
nodeService.updateById(pkgNode);
@@ -52,11 +46,23 @@
EntityUtil.clearBaseProperties(newPkgNode);
newPkgNode.setIsLastEdition(1);
newPkgNode.upgradeVersionNumber();
-
nodeService.save(newPkgNode);
- //澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣111
- List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,pkgNode.getId()).list();
+ //copyNonProgramNodes(pkgNode,newPkgNode);
+ addNewProgramNode(newPkgNode,props.getProcessInstanceId());
+
+ log.info("涓存椂鏇存敼鍗曞洖浼燣istener瀹屾垚");
+ }
+
+ /**
+ * 浠庡緟鍥哄寲鑺傜偣澶嶅埗闈炵▼搴忔枃浠惰妭鐐瑰埌鍥哄寲鑺傜偣涓�
+ * @param oriPkgNode 寰呭浐鍖栬妭鐐�
+ * @param cureNode 鍥哄寲鑺傜偣
+ */
+ /*
+ void copyNonProgramNodes(NcNode oriPkgNode,NcNode cureNode){
+ //澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣1
+ List<NcNode> oriProgramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,oriPkgNode.getId()).list();
FlowProgramFile pfile;
for(NcNode oldProgramNode : oriProgramNodes){
pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
@@ -66,17 +72,23 @@
NcNode newOtherFileNode = new NcNode();
BeanUtils.copyProperties(oldProgramNode,newOtherFileNode);
EntityUtil.clearBaseProperties(newOtherFileNode);
- newOtherFileNode.setParentId(newPkgNode.getId());
- newOtherFileNode.setParentIds(newPkgNode.getParentIds()+","+newPkgNode.getId());
+ newOtherFileNode.setParentId(cureNode.getId());
+ newOtherFileNode.setParentIds(cureNode.subNodeParentIds());
newOtherFileNode.setIsLastEdition(1);
nodeService.save(newOtherFileNode);
}
}
- //nodeService.updateBatchById(oriProgramNodes);
+ }*/
+ /**
+ * 鍔犲叆鏂扮殑绋嬪簭鏂囦欢鑺傜偣
+ * @param newPkgNode 鏂扮殑鑺傜偣锛堝浐鍖栫殑锛�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+ void addNewProgramNode(NcNode newPkgNode,String processInstanceId){
//鏂扮殑鏂囦欢浣滀负鏈�鏂扮増鏈�
- List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,pkgNode.getProcessInstanceId()).list();
+ List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,processInstanceId).list();
for(FlowProgramFile flowProgramFile : files){
NcNode newProgNode = new NcNode();
BeanUtils.copyProperties(newPkgNode, newProgNode);
@@ -85,7 +97,7 @@
newProgNode.setName(flowProgramFile.getName());
newProgNode.setNodeType(NcNode.TYPE_PROGRAM_FILE);
newProgNode.setParentId(newPkgNode.getId());
- newProgNode.setParentIds(newPkgNode.getParentIds()+","+newPkgNode.getId());
+ newProgNode.setParentIds(newPkgNode.subNodeParentIds());
newProgNode.setIsLastEdition(1);
newProgNode.setVersionNumber(newPkgNode.getVersionNumber());
newProgNode.setFlowProgramFileId(flowProgramFile.getId());
@@ -93,8 +105,5 @@
nodeService.save(newProgNode);
}
-
- log.info("鍋忕鍥炰紶Listener瀹屾垚");
}
-
}
--
Gitblit v1.9.3