From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java | 131 +++++++++++++++++++++++++------------------
1 files changed, 76 insertions(+), 55 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
old mode 100644
new mode 100755
index f32cd74..3adcb6b
--- 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
@@ -5,8 +5,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.fee.*;
-import com.java110.dto.user.UserDto;
+import com.java110.dto.fee.BillDto;
+import com.java110.dto.fee.BillOweFeeDto;
+import com.java110.dto.fee.FeeAttrDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDto;
+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 +48,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) {
@@ -62,13 +68,60 @@
return fees;
}
- String[] userIds = getUserIds(fees);
- //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+// String[] userIds = getUserIds(fees);
+// //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+// List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
for (FeeDto fee : fees) {
- refreshFee(fee, users);
+ refreshFee(fee);
}
+
+ 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;
+ }
+
+ @Override
+ public List<FeeDto> querySimpleFees(@RequestBody FeeDto feeDto) {
+
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ int page = feeDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ feeDto.setPage((page - 1) * feeDto.getRow());
+ }
+
+ List<FeeDto> fees = BeanConvertUtil.covertBeanList(feeServiceDaoImpl.getFeeInfo(BeanConvertUtil.beanCovertMap(feeDto)), FeeDto.class);
+
+
+ for(FeeDto tmpFeeDto : fees) {
+ if (!StringUtil.isEmpty(tmpFeeDto.getImportFeeName())) {
+ //fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");
+ tmpFeeDto.setFeeName(tmpFeeDto.getImportFeeName());
+ }
+ }
+
return fees;
}
@@ -84,15 +137,15 @@
/**
* 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
*
- * @param fee 灏忓尯璐圭敤淇℃伅
- * @param users 鐢ㄦ埛鍒楄〃
+ * @param fee 灏忓尯璐圭敤淇℃伅
+ * //@param users 鐢ㄦ埛鍒楄〃
*/
- private void refreshFee(FeeDto fee, List<UserDto> users) {
- for (UserDto user : users) {
- if (fee.getUserId().equals(user.getUserId())) {
- BeanConvertUtil.covertBean(user, fee);
- }
- }
+ private void refreshFee(FeeDto fee) {
+// for (UserDto user : users) {
+// if (fee.getUserId().equals(user.getUserId())) {
+// BeanConvertUtil.covertBean(user, fee);
+// }
+// }
if (!StringUtil.isEmpty(fee.getImportFeeName())) {
//fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");
@@ -175,7 +228,6 @@
public int computeBillOweFeeCount(@RequestBody FeeDto feeDto) {
return feeServiceDaoImpl.computeBillOweFeeCount(BeanConvertUtil.beanCovertMap(feeDto));
}
-
@Override
@@ -306,50 +358,19 @@
}
private void dealFeeConfig(JSONArray data, FeeConfigDto tmpFeeConfigDto) {
- String billType = tmpFeeConfigDto.getBillType();
JSONObject config = new JSONObject();
- if (FeeConfigDto.BILL_TYPE_EVERY.equals(billType)) {
- Map info = new HashMap();
- info.put("configId", tmpFeeConfigDto.getConfigId());
- info.put("communityId", tmpFeeConfigDto.getCommunityId());
- info.put("arrearsEndTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- info.put("state", FeeDto.STATE_DOING);
- int oweFeeCount = feeServiceDaoImpl.queryFeesCount(info);
- config.put("oweFeeCount", oweFeeCount);
-
- info.put("noArrearsEndTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- info.put("state", FeeDto.STATE_DOING);
- int feeCount = feeServiceDaoImpl.queryFeesCount(info);
- config.put("feeCount", feeCount);
-
- config.put("feeName", tmpFeeConfigDto.getFeeName());
- data.add(config);
- return;
- }
- BillDto billDto = new BillDto();
- billDto.setConfigId(tmpFeeConfigDto.getConfigId());
- billDto.setCommunityId(tmpFeeConfigDto.getCommunityId());
- billDto.setCurBill("T");
- List<Map> bills = feeServiceDaoImpl.queryBills(BeanConvertUtil.beanCovertMap(billDto));
- if (bills == null || bills.size() < 1) {
- config.put("oweFeeCount", 0);
- config.put("feeCount", 0);
- config.put("feeName", tmpFeeConfigDto.getFeeName());
- return;
- }
-
- Map tmpBillDto = bills.get(0);
Map info = new HashMap();
- info.put("billId", tmpBillDto.get("billId"));
- info.put("communityId", tmpFeeConfigDto.getCommunityId());
- int oweFeeCount = feeServiceDaoImpl.queryBillOweFeeCount(info);
-
- config.put("oweFeeCount", oweFeeCount);
info.put("configId", tmpFeeConfigDto.getConfigId());
info.put("communityId", tmpFeeConfigDto.getCommunityId());
+ info.put("arrearsEndTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
info.put("state", FeeDto.STATE_DOING);
- int feeTotalCount = feeServiceDaoImpl.queryFeesCount(info);
- config.put("feeCount", feeTotalCount - oweFeeCount);
+ int oweFeeCount = feeServiceDaoImpl.queryFeesCount(info);
+ config.put("oweFeeCount", oweFeeCount);
+
+ info.put("noArrearsEndTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ info.put("state", FeeDto.STATE_DOING);
+ int feeCount = feeServiceDaoImpl.queryFeesCount(info);
+ config.put("feeCount", feeCount);
config.put("feeName", tmpFeeConfigDto.getFeeName());
data.add(config);
--
Gitblit v1.8.0