From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java
index a7f01b4..d04c214 100755
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java
@@ -1,6 +1,7 @@
 package com.java110.fee.smo.impl;
 
 
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.fee.FeeDetailDto;
@@ -9,6 +10,7 @@
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -45,7 +47,37 @@
 
         List<FeeDetailDto> feeDetails = BeanConvertUtil.covertBeanList(feeDetailServiceDaoImpl.getFeeDetailInfo(BeanConvertUtil.beanCovertMap(feeDetailDto)), FeeDetailDto.class);
 
+        refreshFeeDetail(feeDetails);
         return feeDetails;
+    }
+
+    @Override
+    public List<FeeDetailDto> queryBusinessFeeDetails(@RequestBody FeeDetailDto feeDetailDto) {
+
+        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+        int page = feeDetailDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            feeDetailDto.setPage((page - 1) * feeDetailDto.getRow());
+        }
+
+        List<FeeDetailDto> feeDetails = BeanConvertUtil.covertBeanList(feeDetailServiceDaoImpl.getBusinessFeeDetailInfo(BeanConvertUtil.beanCovertMap(feeDetailDto)), FeeDetailDto.class);
+
+        refreshFeeDetail(feeDetails);
+        return feeDetails;
+    }
+
+    private void refreshFeeDetail(List<FeeDetailDto> feeDetails) {
+        if(feeDetails == null || feeDetails.size() < 1){
+            return ;
+        }
+
+        for(FeeDetailDto feeDetailDto : feeDetails){
+            if(!StringUtil.isEmpty(feeDetailDto.getImportFeeName())){
+                feeDetailDto.setFeeName(feeDetailDto.getImportFeeName());
+            }
+        }
     }
 
 
@@ -55,6 +87,7 @@
     }
 
     @Override
+    @Java110Transactional
     public int saveFeeDetail(@RequestBody PayFeeDetailPo payFeeDetailPo) {
         feeDetailServiceDaoImpl.saveFeeDetail(BeanConvertUtil.beanCovertMap(payFeeDetailPo));
         return 1;

--
Gitblit v1.8.0