From 40302884d40c2daceb291ca793a580988427f372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 九月 2021 12:06:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wangfy-dev'
---
service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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..c561079 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
@@ -9,6 +9,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,9 +46,39 @@
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());
+ }
+ }
+ }
+
@Override
public int queryFeeDetailsCount(@RequestBody FeeDetailDto feeDetailDto) {
--
Gitblit v1.8.0