bug修改

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanFrequencyEnum.java

@@ -5,6 +5,7 @@ package com.yeejoin.amos.supervision.common.enums;
  */
 public enum PlanFrequencyEnum {
 
+    NUM("次", "0", "次检查报告"),
     WEEK("周", "2", "周检查报告"),
     MONTH("月", "3", "月检查报告"),
     QUARTER("季度", "4", "季度检查报告");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -276,12 +276,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                         fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
                     } else {
                         if (appleMap != null) {
-                            String state = appleMap.containsKey(car.get("id")) ? appleMap.get(car.get("id")) : null;
+                            //bug: 6268
+                            String state = appleMap.containsKey(car.get("id")) ? appleMap.get(car.get("id")) : FireCarStatusEnum.执勤.getCode();
                             fireCarDto.setCarState(state);
                             fireCarDto.setCarStateDesc(state != null ? FireCarStatusEnum.getEnum(state).getName() : null);
                         } else {
-                            fireCarDto.setCarState(null);
-                            fireCarDto.setCarStateDesc(null);
+                            //bug: 6268
+                            fireCarDto.setCarState(FireCarStatusEnum.执勤.getCode());
+                            fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
                         }
                     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckReportServiceImpl.java

@@ -263,6 +263,11 @@ public class CheckReportServiceImpl extends BaseService<CheckReportDto, CheckRep
         return month + weekDateStr + "日";
     }
 
+    public static String getNumDate(Date date) throws ParseException {
+        String monthDayStr = DateUtils.dateFormat(date, "MM月dd日");
+        return monthDayStr;
+    }
+
     public static String getMonthDate(Date date) {
         return DateUtils.getMonth(date) + "月份";
     }
@@ -400,6 +405,9 @@ public class CheckReportServiceImpl extends BaseService<CheckReportDto, CheckRep
         PlanFrequencyEnum frequencyEnum = PlanFrequencyEnum.getEnumByCode(checkReportDto.getPlanCheckFrequencyType());
         String reportDate;
         switch (frequencyEnum) {
+            case NUM:
+                reportDate = getNumDate(checkReportDto.getStartPlanTaskDate());
+                break;
             case WEEK:
                 reportDate = getWeekDate(checkReportDto.getStartPlanTaskDate());
                 break;