From 3326b8c5a5b9a2133729e4cce8298cb549995f45 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 六月 2025 16:33:10 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
index e34b7e8..cbc1d52 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
@@ -14,10 +14,13 @@
import com.ruoyi.project.service.IServiceFundService;
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFundtaxService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Comparator;
import java.util.List;
/**
@@ -26,6 +29,7 @@
* @author ruoyi
* @date 2024-03-13
*/
+@Slf4j
@Service
public class ServiceFundtaxServiceImpl extends ServiceImpl<ServiceFundtaxMapper, ServiceFundtax> implements IServiceFundtaxService {
@@ -158,11 +162,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean batchFundTax(FundTaxVO fundTaxVO) {
+ log.info("鎵归噺绠楃◣鐨刦undTaxVO鍏ュ弬涓猴細{}", fundTaxVO);
if (fundTaxVO.getFundTaxId() == null) {
throw new BaseException("鍒嗘壒绠楃◣鍑洪棶棰樹簡,璇锋鏌ュ悗鍐嶈繘琛岃绠�");
}
if (fundTaxVO.getAddOrupdate() == 1) {
Integer maxFundTaxId = serviceFundtaxMapper.getMaxFundTaxId();
+ log.info("鎵归噺绠楃◣鐨刴axFundTaxId涓猴細{}", maxFundTaxId);
if (fundTaxVO.getFundTaxId() != maxFundTaxId.longValue()) {
throw new BaseException("璇ユ壒鏁版嵁涓嶈兘绠楃◣");
}
@@ -172,6 +178,10 @@
serviceFund.setFundTaxId(fundTaxVO.getFundTaxId());
serviceFund.setDel_flag(0);
List<ServiceFund> serviceFunds = serviceFundService.selectServiceFundList(serviceFund);
+ if (CollectionUtils.isEmpty(serviceFunds)) {
+ //鏍规嵁id鎺掑簭锛堝崌搴忥級
+ serviceFunds.sort(Comparator.comparing(ServiceFund::getId));
+ }
for (ServiceFund serviceFund1 : serviceFunds) {
ServiceFunddetail serviceFunddetail = new ServiceFunddetail();
serviceFunddetail.setFundid(serviceFund1.getId());
--
Gitblit v1.9.3