java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
b9615ec8c5

+ 1 - 0
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -873,6 +873,7 @@
         <if test="endTime !=null">
             and t.deadline_time &lt;= #{endTime}
         </if>
+        order by t.deadline_time
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

+ 0 - 2
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java

@@ -298,8 +298,6 @@ public class ReportFeeMonthStatisticsApi {
                                                    @RequestParam(value = "unitId", required = false) String unitId,
                                                    @RequestParam(value = "roomId", required = false) String roomId,
                                                    @RequestParam(value = "roomNum", required = false) String roomNum,
-                                                   @RequestParam(value = "startTime", required = false) String startTime,
-                                                   @RequestParam(value = "endTime", required = false) String endTime,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
         ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();

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

@@ -229,8 +229,8 @@ public class GetReportFeeMonthStatisticsBMOImpl implements IGetReportFeeMonthSta
 
         for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
             try {
-                int day = DateUtil.daysBetween(nowDate, DateUtil.getDateFromString(reportFeeMonthStatisticsDto.getDeadlineTime(),
-                        DateUtil.DATE_FORMATE_STRING_A));
+                int day = DateUtil.daysBetween(DateUtil.getDateFromString(reportFeeMonthStatisticsDto.getDeadlineTime(),
+                        DateUtil.DATE_FORMATE_STRING_A), nowDate);
                 reportFeeMonthStatisticsDto.setOweDay(day);
             } catch (Exception e) {
                 logger.error("计算欠费天数失败", e);