From d537057a0bac012bb6909b89586089a01b8d8a9e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 13:48:03 +0800
Subject: [PATCH] 新增供应商银行
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
index 030053d..311e4e0 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
@@ -564,17 +564,16 @@
}
/**
- * 瀵煎叆搴旀敹璐圭敤绠＄悊鏁版嵁
+ * 瀵煎叆搴旀敹璐圭敤绠＄悊鏁版嵁锛堝寘鍚槑缁嗘暟鎹級
*
- * @param receivableFeeList 搴旀敹璐圭敤绠＄悊鏁版嵁鍒楄〃
- * @param updateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
+ * @param receivableFeeList 搴旀敹璐圭敤绠＄悊鏁版嵁鍒楄〃锛堝寘鍚槑缁嗘暟鎹級
* @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
@Override
- public String importReceivableFee(List<ReceivableFeeManagement> receivableFeeList, Boolean updateSupport, String operName) {
+ public String importReceivableFee(List<ReceivableFeeManagement> receivableFeeList, String operName) {
if (receivableFeeList == null || receivableFeeList.isEmpty()) {
- return "瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�";
+ return "瀵煎叆鏁版嵁涓嶈兘涓虹┖锛�";
}
int successNum = 0;
int failureNum = 0;
@@ -583,37 +582,33 @@
for (ReceivableFeeManagement receivableFee : receivableFeeList) {
try {
- // 楠岃瘉绯荤粺缂栧彿鏄惁鍞竴
- ReceivableFeeManagement checkFee = new ReceivableFeeManagement();
- checkFee.setSystemNo(receivableFee.getSystemNo());
- List<ReceivableFeeManagement> existingFees = selectReceivableFeeManagementList(checkFee);
+ // 鑷姩鐢熸垚绯荤粺缂栧彿锛堝拰鏂板鍔熻兘涓�鏍凤級
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YS);
+ receivableFee.setSystemNo(noByKey);
- if (!existingFees.isEmpty()) {
- // 瀛樺湪閲嶅璁板綍
- if (updateSupport) {
- // 鏇存柊鏀寔锛岃繘琛屾洿鏂版搷浣�
- ReceivableFeeManagement existingFee = existingFees.get(0);
- receivableFee.setId(existingFee.getId());
- receivableFee.setUpdateTime(DateUtils.getNowDate());
- receivableFee.setUpdateBy(operName);
- updateReceivableFeeManagement(receivableFee);
- successNum++;
- successMsg.append("<br/>" + successNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 鏇存柊鎴愬姛");
- } else {
- failureNum++;
- failureMsg.append("<br/>" + failureNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 宸插瓨鍦�");
- }
- } else {
- // 鏂板璁板綍
- receivableFee.setCreateTime(DateUtils.getNowDate());
- receivableFee.setCreateBy(operName);
- insertReceivableFeeManagement(receivableFee);
+ // 璁剧疆鍒涘缓鏃堕棿鍜屽垱寤轰汉
+ receivableFee.setCreateTime(DateUtils.getNowDate());
+ receivableFee.setCreateBy(operName);
+
+ // 璁＄畻搴旀敹閲戦瀛楃涓叉弿杩�
+ if (receivableFee.getReceivableFeeDetailList() != null && !receivableFee.getReceivableFeeDetailList().isEmpty()) {
+ String receivableAmountStr = calculateReceivableAmountStr(receivableFee.getReceivableFeeDetailList());
+ receivableFee.setReceivableAmountStr(receivableAmountStr);
+ }
+
+ // 鏂板璁板綍锛堜笉鍋氬瓨鍦ㄦ�у垽鏂級
+ int result = insertReceivableFeeManagement(receivableFee);
+
+ if (result > 0) {
successNum++;
successMsg.append("<br/>" + successNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 瀵煎叆鎴愬姛");
+ } else {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 瀵煎叆澶辫触");
}
} catch (Exception e) {
failureNum++;
- String msg = "<br/>" + failureNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 瀵煎叆澶辫触锛�";
+ String msg = "<br/>" + failureNum + ". 绯荤粺缂栧彿 " + (receivableFee.getSystemNo() != null ? receivableFee.getSystemNo() : "鏈煡") + " 瀵煎叆澶辫触锛�";
failureMsg.append(msg + e.getMessage());
logger.error(msg, e);
}
--
Gitblit v1.8.0