From 62d30ce6a198782ea55fdb8f1ffd11389c92c914 Mon Sep 17 00:00:00 2001
From: jinhai <9314122@qq.com>
Date: 星期五, 18 九月 2020 22:03:11 +0800
Subject: [PATCH] 预存费用更改
---
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
index f32cd74..4937522 100644
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
@@ -7,6 +7,7 @@
import com.java110.dto.PageDto;
import com.java110.dto.fee.*;
import com.java110.dto.user.UserDto;
+import com.java110.fee.dao.IFeeAttrServiceDao;
import com.java110.fee.dao.IFeeServiceDao;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -44,12 +45,14 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IFeeAttrServiceDao feeAttrServiceDaoImpl;
+
@Override
public List<FeeDto> queryFees(@RequestBody FeeDto feeDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
int page = feeDto.getPage();
if (page != PageDto.DEFAULT_PAGE) {
@@ -68,6 +71,30 @@
for (FeeDto fee : fees) {
refreshFee(fee, users);
+ }
+
+ List<String> feeIds = new ArrayList<>();
+ for (FeeDto tmpFeeDto : fees) {
+ feeIds.add(tmpFeeDto.getFeeId());
+ }
+
+ Map info = new HashMap();
+ info.put("feeIds", feeIds);
+ info.put("communityId", feeDto.getCommunityId());
+
+ List<Map> attrMaps = feeAttrServiceDaoImpl.getFeeAttrInfo(info);
+
+ List<FeeAttrDto> feeAttrDtos = BeanConvertUtil.covertBeanList(attrMaps, FeeAttrDto.class);
+ List<FeeAttrDto> tmpFeeAttrDtos = null;
+ for (FeeDto tmpFeeDto : fees) {
+ tmpFeeAttrDtos = new ArrayList<>();
+ for (FeeAttrDto feeAttrDto : feeAttrDtos) {
+
+ if (tmpFeeDto.getFeeId().equals(feeAttrDto.getFeeId())) {
+ tmpFeeAttrDtos.add(feeAttrDto);
+ }
+ }
+ tmpFeeDto.setFeeAttrDtos(tmpFeeAttrDtos);
}
return fees;
}
@@ -175,7 +202,6 @@
public int computeBillOweFeeCount(@RequestBody FeeDto feeDto) {
return feeServiceDaoImpl.computeBillOweFeeCount(BeanConvertUtil.beanCovertMap(feeDto));
}
-
@Override
--
Gitblit v1.8.0