From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单
---
service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
index 361adf3..890e6ae 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
@@ -7,8 +7,10 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -32,6 +34,9 @@
@Autowired
private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+ @Autowired
+ private IPayFeeDetailDiscountInnerServiceSMO payFeeDetailDiscountInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
@@ -39,7 +44,7 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-//鑾峰彇寮�濮嬫椂闂�
+ //鑾峰彇寮�濮嬫椂闂�
if (!StringUtil.isEmpty(reqJson.getString("startTime"))) {
String startTime = reqJson.getString("startTime") + " 00:00:00";
reqJson.put("startTime", startTime);
@@ -82,6 +87,10 @@
feeAccountDetailDto.setDetailId(feeDetail.getDetailId());
List<FeeAccountDetailDto> feeAccountDetailDtos = feeAccountDetailServiceSMOImpl.queryFeeAccountDetails(feeAccountDetailDto);
feeDetail.setFeeAccountDetailDtoList(feeAccountDetailDtos);
+ PayFeeDetailDiscountDto payFeeDetailDiscountDto = new PayFeeDetailDiscountDto();
+ payFeeDetailDiscountDto.setDetailId(feeDetail.getDetailId());
+ List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtos = payFeeDetailDiscountInnerServiceSMOImpl.queryPayFeeDetailDiscounts(payFeeDetailDiscountDto);
+ feeDetail.setPayFeeDetailDiscountDtoList(payFeeDetailDiscountDtos);
feeDetailList.add(feeDetail);
}
List<ApiFeeDetailDataVo> feeDetails = BeanConvertUtil.covertBeanList(feeDetailList, ApiFeeDetailDataVo.class);
--
Gitblit v1.8.0