From b30c1ebb0e46e734e70f8731484764f449f48818 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 24 十二月 2025 00:04:30 +0800
Subject: [PATCH] feat:已完成时，增加知情同意书的上传判断
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
index 48e2a37..7c6ab7a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
@@ -49,7 +49,6 @@
* @return 鏄惁鍚屾鎴愬姛
*/
@Override
- @Transactional
public boolean syncTaskStatusFromLegacy(Long taskId) {
if (!legacyConfig.isEnabled()) {
log.info("鏃х郴缁熷悓姝ュ凡绂佺敤锛岃烦杩囩姸鎬佸悓姝ワ紝浠诲姟ID: {}", taskId);
@@ -108,13 +107,13 @@
@Override
public int batchSyncTaskStatusFromLegacy() {
if (!legacyConfig.isEnabled()) {
- log.info("鏃х郴缁熷悓姝ュ凡绂佺敤");
+// log.info("鏃х郴缁熷悓姝ュ凡绂佺敤");
return 0;
}
try {
int totalSuccessCount = 0;
- int pageSize = 200; // 姣忛〉200鏉�
+ int pageSize = 10; // 姣忛〉200鏉�
int offset = 0;
while (true) {
@@ -122,11 +121,11 @@
List<SysTaskEmergency> syncedTasks = sysTaskEmergencyService.selectSyncedTasksForStatusUpdate(offset, pageSize);
if (syncedTasks == null || syncedTasks.isEmpty()) {
- log.info("娌℃湁鏇村闇�瑕佸悓姝ョ姸鎬佺殑浠诲姟锛宱ffset: {}", offset);
+// log.info("娌℃湁鏇村闇�瑕佸悓姝ョ姸鎬佺殑浠诲姟锛宱ffset: {}", offset);
break; // 娌℃湁鏇村鏁版嵁锛岄��鍑哄惊鐜�
}
- log.info("寮�濮嬪悓姝ョ姸鎬佺 {} 椤碉紝浠诲姟鏁伴噺: {}", (offset / pageSize) + 1, syncedTasks.size());
+// log.info("寮�濮嬪悓姝ョ姸鎬佺 {} 椤碉紝浠诲姟鏁伴噺: {}", (offset / pageSize) + 1, syncedTasks.size());
// 2. 鎻愬彇璋冨害鍗旾D鍒楄〃
List<Long> dispatchOrdIDs = new ArrayList<>();
@@ -141,7 +140,7 @@
}
if (dispatchOrdIDs.isEmpty()) {
- log.warn("鏈〉娌℃湁鏈夋晥鐨勮皟搴﹀崟ID");
+// log.warn("鏈〉娌℃湁鏈夋晥鐨勮皟搴﹀崟ID");
offset += pageSize;
continue;
}
@@ -178,7 +177,7 @@
// 鑾峰彇鏃х郴缁熺姸鎬�
Integer legacyStatus = dispatchIdToStateMap.get(dispatchOrdId);
if (legacyStatus == null) {
- log.warn("鏈壘鍒拌皟搴﹀崟鐘舵�侊紝DispatchOrdID: {}", dispatchOrdId);
+// log.warn("鏈壘鍒拌皟搴﹀崟鐘舵�侊紝DispatchOrdID: {}", dispatchOrdId);
continue;
}
@@ -190,19 +189,19 @@
}
totalSuccessCount += pageSuccessCount;
- log.info("鐘舵�佺 {} 椤靛悓姝ュ畬鎴愶紝鎬绘暟: {}, 鎴愬姛: {}",
- (offset / pageSize) + 1, syncedTasks.size(), pageSuccessCount);
-
+// log.info("鐘舵�佺 {} 椤靛悓姝ュ畬鎴愶紝鎬绘暟: {}, 鎴愬姛: {}",
+// (offset / pageSize) + 1, syncedTasks.size(), pageSuccessCount);
+//
// 濡傛灉鏈〉鏁版嵁灏戜簬姣忛〉澶у皬锛岃鏄庡凡缁忔槸鏈�鍚庝竴椤�
if (syncedTasks.size() < pageSize) {
- log.info("宸插埌杈炬渶鍚庝竴椤碉紝鐘舵�佸悓姝ョ粨鏉�");
+// log.info("宸插埌杈炬渶鍚庝竴椤碉紝鐘舵�佸悓姝ョ粨鏉�");
break;
}
offset += pageSize; // 涓嬩竴椤�
}
- log.info("鎵归噺鍚屾浠诲姟鐘舵�佸畬鎴愶紝鎬绘垚鍔熸暟: {}", totalSuccessCount);
+// log.info("鎵归噺鍚屾浠诲姟鐘舵�佸畬鎴愶紝鎬绘垚鍔熸暟: {}", totalSuccessCount);
return totalSuccessCount;
} catch (Exception e) {
@@ -219,7 +218,6 @@
* @param legacyStatus 鏃х郴缁熺姸鎬佺爜
* @return 鏄惁鎴愬姛
*/
- @Transactional
private boolean syncTaskStatusWithLegacyState(Long taskId, Integer legacyStatus) {
try {
// 鏌ヨ浠诲姟淇℃伅
--
Gitblit v1.9.1