From 74f9e1f4f009907d4f8ebda80f522a25a25f87f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:32:59 +0800
Subject: [PATCH] fix:同步（安全培训-筛选优化）
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 9e70dfd..de7e81b 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -264,6 +264,14 @@
}
}
+ // 鍏ュ簱瀹℃牳
+ if (approveProcess.getApproveType().equals(9)) {
+ StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
+ if (!approveNode.isInventoryReview()) {
+ stockInRecord.setApproveStatus(3);
+ stockInRecordService.updateById(stockInRecord);
+ }
+ }
// 缁戝畾闄勪欢
if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) {
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
@@ -287,7 +295,14 @@
approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
"/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
- } else if (approveProcess.getApproveType() == 9) {
+ } else {
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
+ }
+ } else {
+ if (approveProcess.getApproveType() == 9) {
StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
if (approveNode.isInventoryReview()) {
if ("涓嶅悎鏍煎叆搴�".equals(approveNode.getStorageType())) {
@@ -297,22 +312,7 @@
}
stockInRecord.setApproveStatus(2);
stockInRecordService.updateById(stockInRecord);
- sysNoticeService.simpleNoticeByUser(
- approveProcessType(approveProcess.getApproveType()),
- approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType()
- + "&approveId=" + approveProcess.getApproveId()
- );
- }else {
- stockInRecord.setApproveStatus(3);
- stockInRecordService.updateById(stockInRecord);
}
- } else {
- sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
- approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
}
}
break;
--
Gitblit v1.9.3