优化代码

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -36,7 +36,6 @@ public class DateUtil {
     public static final String DATE_FORMATE_STRING_Q = "yyyy-MM";
 
 
-
     static {
         formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
         formats.put("yyyy-MM-dd HH:mm:ss", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
@@ -416,6 +415,27 @@ public class DateUtil {
         return curDate;
     }
 
+    public static Date getFirstDate(Date curDate) {
+        Calendar curDateCal = Calendar.getInstance();
+        curDateCal.setTime(curDate);
+        curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+        curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+        curDateCal.set(Calendar.MINUTE, 0);
+        curDateCal.set(Calendar.SECOND, 0);
+        return curDateCal.getTime();
+    }
+
+    public static Date getFirstDate(String curDate) {
+        Date date = DateUtil.getDateFromStringB(curDate);
+        Calendar curDateCal = Calendar.getInstance();
+        curDateCal.setTime(date);
+        curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+        curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+        curDateCal.set(Calendar.MINUTE, 0);
+        curDateCal.set(Calendar.SECOND, 0);
+        return curDateCal.getTime();
+    }
+
 
     public static String getNextMonthFirstDay(String fmt) {
         String returndate = "";
@@ -758,11 +778,12 @@ public class DateUtil {
 
     /**
      * 除去 小时 分 秒
+     *
      * @param time
      * @return
      */
-    public static Date timeToDate(Date time){
-        Calendar calendar =Calendar.getInstance();
+    public static Date timeToDate(Date time) {
+        Calendar calendar = Calendar.getInstance();
         calendar.setTime(time);
         setTimeToMidnight(calendar);
         return calendar.getTime();

service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java

@@ -103,8 +103,11 @@ public class QueryDataReportFeeStatisticsCmd extends Cmd {
         data.put("freeCount", freeCount);
 
         // todo 查询 历史欠费
+        //这里设置查询月1日 不然历史和总欠费一样有点奇怪
+        queryStatisticsDto.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getFirstDate(reqJson.getString("startDate"))));
         double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
         data.put("hisMonthOweFee", hisMonthOweFee);
+        queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
 
         // todo 查询总欠费
         double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);