Ver código fonte

预测对比接口新增 时间筛选bug调整(因为是具体到小时了)

王苗苗 7 meses atrás
pai
commit
23236e295d

BIN
slibra-admin/.DS_Store


+ 7 - 2
slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiForecastComparisonController.java

@@ -73,8 +73,8 @@ public class TXinyiForecastComparisonController extends BaseController
         Date nowDate = DateUtils.getNowDate();
         Date dayBefore7 = DateUtils.plusDate(-7, nowDate);
         //先用日期获取当天和前一天的数据,如果获取不到,则提示错误信息
-        String nowDateStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, nowDate);
-        String dayBefore7Str = DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, dayBefore7);
+        String nowDateStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, nowDate)  + TIME_END_23;
+        String dayBefore7Str = DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, dayBefore7)  + TIME_BEGIN_00;
         if(StringUtils.isBlank(timeBegin))
             tXinyiForecastComparison.setTimeBegin(dayBefore7Str);
         if(StringUtils.isBlank(timeEnd))
@@ -168,4 +168,9 @@ public class TXinyiForecastComparisonController extends BaseController
     {
         return toAjax(tXinyiForecastComparisonService.deleteTXinyiForecastComparisonByIds(ids));
     }
+
+    public static void main(String[] args) {
+        System.out.println(DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, DateUtils.getNowDate()) + TIME_BEGIN_00);
+        System.out.println(DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, DateUtils.getNowDate()) + TIME_END_23);
+    }
 }

+ 3 - 0
slibra-common/src/main/java/com/slibra/common/constant/MyConstants.java

@@ -343,6 +343,9 @@ public class MyConstants {
     public static final String SORT_ASC = "asc";
     public static final String SORT_DESC = "desc";
 
+    public static final String TIME_BEGIN_00 = " 00";
+    public static final String TIME_END_23 = " 23";
+
     public static void main(String[] args) {
         System.out.println(DecimalUtils.getAbsAndScale(new BigDecimal("2.211"), MyConstants.INT_0));
         System.out.println(DecimalUtils.getAbsAndScaleStr("2.211", MyConstants.INT_0));