优化 代码

service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java

@@ -264,6 +264,12 @@ public class GetReportFeeMonthStatisticsBMOImpl implements IGetReportFeeMonthSta
 
     @Override
     public ResponseEntity<String> queryFeeBreakdown(ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+
+        if(StringUtil.isEmpty(reportFeeMonthStatisticsDto.getYearMonth())){
+            reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear()+"");
+            reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth()+"");
+        }
+
         int count = reportFeeMonthStatisticsInnerServiceSMOImpl.queryFeeBreakdownCount(reportFeeMonthStatisticsDto);
 
         List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = null;

service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeBreakdownDetailCmd.java

@@ -10,6 +10,7 @@ import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
 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;
@@ -36,6 +37,10 @@ public class QueryReportFeeBreakdownDetailCmd extends Cmd {
     @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");
         }