瀏覽代碼

优化代码

java110 3 年之前
父節點
當前提交
106c7dfed5

+ 8 - 0
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -455,6 +455,14 @@ public class DateUtil {
         return sf.format(c.getTime());
     }
 
+    public static String getAddDayStringB(Date date,int days) {
+        SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_B);
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.add(Calendar.DAY_OF_MONTH, days);
+        return sf.format(c.getTime());
+    }
+
     /**
      * 在给定的日期加上或减去指定月份后的日期
      *

+ 4 - 1
service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentSummaryCmd.java

@@ -77,7 +77,10 @@ public class ListCarInoutPaymentSummaryCmd extends Cmd {
             carInoutPaymentDto.setStartTime(DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_B));
         }
         if(StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
-            carInoutPaymentDto.setEndTime(DateUtil.getFormatTimeString(new Date(),DateUtil.DATE_FORMATE_STRING_B));
+            carInoutPaymentDto.setEndTime(DateUtil.getFormatTimeString(new Date(),DateUtil.DATE_FORMATE_STRING_B) + " 23:59:59");
+        }else{
+            Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
+            carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
         }
         List<CarInoutPaymentDto> carInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentSummary(carInoutPaymentDto);