From 63bfc2543ee5b52d03bfcd215d9958ba8e2fb755 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 16:31:39 +0800
Subject: [PATCH] optimize report

---
 service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeBreakdownDetailCmd.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeBreakdownDetailCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeBreakdownDetailCmd.java
index c7ef5ff..5bd7a6b 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeBreakdownDetailCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeBreakdownDetailCmd.java
@@ -10,6 +10,7 @@
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,13 +30,17 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "communityId", "鏈紶鍏ュ皬鍖轰俊鎭�");
-        Assert.hasKeyAndValue(reqJson, "feeName", "鏈紶鍏ヨ垂鐢ㄩ」鍚嶇О");
+        Assert.hasKeyAndValue(reqJson, "configId", "鏈紶鍏ヨ垂鐢ㄩ」");
         super.validatePageInfo(reqJson);
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthStatisticsDto.class);
+        if(StringUtil.isEmpty(reportFeeMonthStatisticsDto.getYearMonth())){
+            reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear()+"");
+            reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth()+"");
+        }
         if (!StringUtil.isEmpty(reportFeeMonthStatisticsDto.getStartTime())) {
             reportFeeMonthStatisticsDto.setStartTime(reportFeeMonthStatisticsDto.getStartTime() + " 00:00:00");
         }

--
Gitblit v1.8.0