From 5d75fcaea0a3774052b7484a4ffe755258502363 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 20:49:11 +0800
Subject: [PATCH] fix:开始执行人员就绪按钮
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdditionalFeeSyncServiceImpl.java | 68 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 40 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdditionalFeeSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdditionalFeeSyncServiceImpl.java
index 2aaeef3..ee5f42c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdditionalFeeSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdditionalFeeSyncServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;
-import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -9,11 +8,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.PaidMoneyAdd;
import com.ruoyi.system.domain.SysTask;
import com.ruoyi.system.domain.SysTaskAdditionalFee;
@@ -92,21 +87,13 @@
}
@Override
- @Transactional
- @DataSource(DataSourceType.SQLSERVER)
- public boolean syncAdditionalFeeToLegacy(Long feeId) {
+ public boolean syncAdditionalFeeToLegacy(SysTaskAdditionalFee fee) {
+ Long feeId= fee.getId();
try {
- // 1. 鏌ヨ鏂扮郴缁熼檮鍔犺垂鐢ㄨ褰�
- SysTaskAdditionalFee fee = additionalFeeMapper.selectByTaskId(null).stream()
- .filter(f -> f.getId().equals(feeId))
- .findFirst()
- .orElse(null);
+
- if (fee == null) {
- log.error("鏂扮郴缁熼檮鍔犺垂鐢ㄨ褰曚笉瀛樺湪锛宖eeId: {}", feeId);
- return false;
- }
-
+
+ // 1. 妫�鏌ユ槸鍚﹀凡鍚屾
// 2. 濡傛灉宸插悓姝ヨ繃锛岃烦杩�
if (fee.getPid() != null && fee.getPid() > 0) {
log.info("闄勫姞璐圭敤宸插悓姝ワ紝feeId: {}, pid: {}", feeId, fee.getPid());
@@ -174,45 +161,47 @@
return false;
}
}
-
+
+ /**
+ * 浠庢棫绯荤粺鍚屾闄勫姞璐圭敤
+ * @param paidMoneyAdd 鏃х郴缁熼檮鍔犺垂鐢ㄨ褰旾D
+ * @return
+ */
@Override
- @Transactional
- public boolean syncAdditionalFeeFromLegacy(Long paidMoneyAddId) {
+ public boolean syncAdditionalFeeFromLegacy(PaidMoneyAdd paidMoneyAdd) {
try {
- // 1. 鏌ヨ鏃х郴缁烶aidMoney_Add璁板綍
- PaidMoneyAdd paidMoneyAdd = paidMoneyAddMapper.selectById(paidMoneyAddId);
- if (paidMoneyAdd == null) {
- log.error("鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曚笉瀛樺湪锛宲aidMoneyAddId: {}", paidMoneyAddId);
- return false;
- }
-
+ Long paidMoneyAddId = paidMoneyAdd.getId();
+ log.info("1.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤锛宲aidMoneyAddId: {}", paidMoneyAddId);
// 2. 妫�鏌ユ槸鍚﹀凡鍚屾杩�
SysTaskAdditionalFee existFee = additionalFeeMapper.selectByPid(paidMoneyAddId);
if (existFee != null) {
log.info("鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曞凡鍚屾锛宲aidMoneyAddId: {}, feeId: {}", paidMoneyAddId, existFee.getId());
return true;
}
+ log.info("2.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤锛宲aidMoneyAddId: {}", paidMoneyAddId);
// 3. 鏍规嵁ServiceOrdID鏌ヨ鏂扮郴缁熶换鍔�
if (paidMoneyAdd.getToServiceOrdID() == null) {
log.warn("鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曠己灏慡erviceOrdID锛宲aidMoneyAddId: {}锛岃烦杩囧悓姝�", paidMoneyAddId);
return false;
}
+ log.info("3.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤锛宲aidMoneyAddId: {}, ServiceOrdID: {}", paidMoneyAddId, paidMoneyAdd.getToServiceOrdID());
SysTaskEmergency emergency = sysTaskEmergencyMapper.selectByLegacyServiceOrdId(paidMoneyAdd.getToServiceOrdID());
if (emergency == null) {
- log.warn("鏈壘鍒板搴旂殑杞繍浠诲姟锛孲erviceOrdID: {}锛岃烦杩囧悓姝�", paidMoneyAdd.getToServiceOrdID());
+ log.warn("4.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤,鏈壘鍒板搴旂殑杞繍浠诲姟锛孲erviceOrdID: {}锛岃烦杩囧悓姝�", paidMoneyAdd.getToServiceOrdID());
return false;
}
-
+
+ log.info("4.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤锛宲aidMoneyAddId: {}, ServiceOrdID: {}, DispatchOrdID: {}", paidMoneyAddId, paidMoneyAdd.getToServiceOrdID(), paidMoneyAdd.getToDispatchOrdID());
// 4. 楠岃瘉DispatchOrdID鏄惁鍖归厤
if (paidMoneyAdd.getToDispatchOrdID() == null) {
log.warn("鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曠己灏慏ispatchOrdID锛宲aidMoneyAddId: {}锛岃烦杩囧悓姝�", paidMoneyAddId);
return false;
}
-
+ log.info("5.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤锛宲aidMoneyAddId: {}, ServiceOrdID: {}, DispatchOrdID: {}", paidMoneyAddId, paidMoneyAdd.getToServiceOrdID(), paidMoneyAdd.getToDispatchOrdID());
if (!paidMoneyAdd.getToDispatchOrdID().equals(emergency.getLegacyDispatchOrdId())) {
- log.warn("杞繍浠诲姟DispatchOrdID涓嶅尮閰嶏紝ServiceOrdID: {}, 闄勫姞璐圭敤DispatchOrdID: {} vs 浠诲姟DispatchOrdID: {}锛岃烦杩囧悓姝�",
+ log.warn("5.杞繍浠诲姟DispatchOrdID涓嶅尮閰嶏紝ServiceOrdID: {}, 闄勫姞璐圭敤DispatchOrdID: {} vs 浠诲姟DispatchOrdID: {}锛岃烦杩囧悓姝�",
paidMoneyAdd.getToServiceOrdID(), paidMoneyAdd.getToDispatchOrdID(), emergency.getLegacyDispatchOrdId());
return false;
}
@@ -231,19 +220,19 @@
fee.setPid(paidMoneyAddId);
fee.setSyncStatus(2); // 鍚屾鎴愬姛
fee.setSyncTime(new Date());
-
+ log.info("6.寮�濮嬪悓姝ユ棫绯荤粺闄勫姞璐圭敤锛宲aidMoneyAddId: {}, ServiceOrdID: {}, DispatchOrdID: {}, feeId: {}", paidMoneyAddId, paidMoneyAdd.getToServiceOrdID(), paidMoneyAdd.getToDispatchOrdID(), fee.getId());
// 6. 鎻掑叆鏂扮郴缁熼檮鍔犺垂鐢ㄨ褰�
int result = additionalFeeMapper.insert(fee);
if (result > 0) {
- log.info("鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曞悓姝ュ埌鏂扮郴缁熸垚鍔燂紝paidMoneyAddId: {}, feeId: {}", paidMoneyAddId, fee.getId());
+ log.info("6.鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曞悓姝ュ埌鏂扮郴缁熸垚鍔燂紝paidMoneyAddId: {}, feeId: {}", paidMoneyAddId, fee.getId());
return true;
} else {
- log.error("鎻掑叆鏂扮郴缁熼檮鍔犺垂鐢ㄨ褰曞け璐ワ紝paidMoneyAddId: {}", paidMoneyAddId);
+ log.error("6.鎻掑叆鏂扮郴缁熼檮鍔犺垂鐢ㄨ褰曞け璐ワ紝paidMoneyAddId: {}", paidMoneyAddId);
return false;
}
} catch (Exception e) {
- log.error("鍚屾鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曞埌鏂扮郴缁熷紓甯革紝paidMoneyAddId: {}", paidMoneyAddId, e);
+ log.error("8.鍚屾鏃х郴缁熼檮鍔犺垂鐢ㄨ褰曞埌鏂扮郴缁熷紓甯革紝paidMoneyAddId: {}", paidMoneyAdd.getId(), e);
return false;
}
}
@@ -259,7 +248,7 @@
for (SysTaskAdditionalFee fee : unsyncedFees) {
try {
- if (syncAdditionalFeeToLegacy(fee.getId())) {
+ if (syncAdditionalFeeToLegacy(fee)) {
successCount++;
}
// 姣忔潯璁板綍闂撮殧1绉掞紝閬垮厤杩囦簬棰戠箒
@@ -278,8 +267,7 @@
return successCount;
}
- @Override
- @DataSource(DataSourceType.SQLSERVER)
+ @Override
public int batchSyncAdditionalFeeFromLegacy(Integer hours) {
int successCount = 0;
try {
@@ -294,7 +282,7 @@
for (PaidMoneyAdd paidMoneyAdd : recentRecords) {
try {
- if (syncAdditionalFeeFromLegacy(paidMoneyAdd.getId())) {
+ if (syncAdditionalFeeFromLegacy(paidMoneyAdd)) {
successCount++;
}
// 姣忔潯璁板綍闂撮殧1绉掞紝閬垮厤杩囦簬棰戠箒
--
Gitblit v1.9.1