optimize

java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java

@@ -61,6 +61,7 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     private String startTime;
     private String endTime;
 
+
     private String statusCd = "0";
 
     private int oweDay;

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

@@ -1725,6 +1725,12 @@
         <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
+        <if test="feeStartTime !=null and feeStartTime != ''">
+            and t.start_time &gt;= #{feeStartTime}
+        </if>
+        <if test="feeEndTime !=null and feeEndTime != ''">
+            and t.end_time &lt;= #{feeEndTime}
+        </if>
         <if test="cashierId !=null and cashierId != ''">
             and t.cashier_id= #{cashierId}
         </if>
@@ -1827,6 +1833,12 @@
         <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
+        <if test="feeStartTime !=null and feeStartTime != ''">
+            and t.start_time &gt;= #{feeStartTime}
+        </if>
+        <if test="feeEndTime !=null and feeEndTime != ''">
+            and t.end_time &lt;= #{feeEndTime}
+        </if>
         <if test="cashierId !=null and cashierId != ''">
             and t.cashier_id= #{cashierId}
         </if>

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

@@ -301,6 +301,8 @@ public class ReportFeeMonthStatisticsApi {
                                                     @RequestParam(value = "configId", required = false) String configId,
                                                     @RequestParam(value = "startTime", required = false) String startTime,
                                                     @RequestParam(value = "endTime", required = false) String endTime,
+                                                    @RequestParam(value = "feeStartTime", required = false) String feeStartTime,
+                                                    @RequestParam(value = "feeEndTime", required = false) String feeEndTime,
                                                     @RequestParam(value = "objId", required = false) String objId,
                                                     @RequestParam(value = "roomName", required = false) String roomName,
                                                     @RequestParam(value = "page") int page,
@@ -321,6 +323,8 @@ public class ReportFeeMonthStatisticsApi {
         reportFeeMonthStatisticsDto.setConfigId(configId);
         reportFeeMonthStatisticsDto.setStartTime(startTime);
         reportFeeMonthStatisticsDto.setEndTime(endTime);
+        reportFeeMonthStatisticsDto.setFeeStartTime(feeStartTime);
+        reportFeeMonthStatisticsDto.setFeeEndTime(feeEndTime);
         reportFeeMonthStatisticsDto.setObjId(objId);
         if(!StringUtil.isEmpty(roomName)){
             String[] roomNameArray = roomName.split("-",3);