APP驾驶舱-综合数据预案演练

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/controller/AppCockpitController.java

@@ -128,8 +128,8 @@ public class AppCockpitController extends BaseController {
      */
     @ApiOperation(value = "综合数据-预案演练", response = AppSyntheticSafetycheckVo.class)
     @GetMapping("/synthetic/drill")
-    public AjaxResult syntheticDrill(Date month) {
-        AppSyntheticDrillVo vo = appCockpitService.syntheticDrill(month);
+    public AjaxResult syntheticDrill(Date date) {
+        AppSyntheticDrillVo vo = appCockpitService.syntheticDrill(date);
         return success(vo);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/AppCockpitService.java

@@ -51,10 +51,10 @@ public interface AppCockpitService {
 
     /**
      * 综合数据-预案演练
-     * @param month
+     * @param date
      * @return
      */
-    AppSyntheticDrillVo syntheticDrill(Date month);
+    AppSyntheticDrillVo syntheticDrill(Date date);
 
     /**
      * 综合数据-其它

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -350,9 +350,9 @@ public class AppCockpitServiceImpl implements AppCockpitService {
      * @return
      */
     @Override
-    public AppSyntheticDrillVo syntheticDrill(Date month) {
+    public AppSyntheticDrillVo syntheticDrill(Date date) {
         SysOrg org = getLoginOrg();
-        DateRange range = DateUtils.getStartAndEnd(month, CycleCommonEnum.QUARTERLY);
+        DateRange range = DateUtils.getStartAndEnd(date, CycleCommonEnum.QUARTERLY);
         List<AppSyntheticTaskCategoryDto> taskCategoryDtos = appCockpitMapper.selectSyntheticDrill(org.getPath(), range.getStartTime(), range.getEndTime());
         AppSyntheticDrillVo vo = new AppSyntheticDrillVo();
         vo.setInfoByType(new HashMap<>());
@@ -374,13 +374,12 @@ public class AppCockpitServiceImpl implements AppCockpitService {
             return true;
         };
 
-        predicate3.test(Arrays.asList("3"), "网点自查", null);
-        predicate3.test(Arrays.asList("4"), "全面检查", null);
-        predicate3.test(Arrays.asList("2"), "办事处检查", null);
-        predicate3.test(Arrays.asList("1"), "省联社检查", null);
-        predicate3.test(Arrays.asList("5"), "阶段性检查", null);
-        predicate3.test(Arrays.asList("6"), "专项检查", null);
-        predicate3.test(Arrays.asList("7"), "其它检查", null);
+        predicate3.test(Arrays.asList("1"), "防抢", null);
+        predicate3.test(Arrays.asList("2"), "防盗", null);
+        predicate3.test(Arrays.asList("3"), "反诈", null);
+        predicate3.test(Arrays.asList("5"), "自然灾害", null);
+        predicate3.test(Arrays.asList("4"), "消防及疏散", null);
+        predicate3.test(Arrays.asList("6"), "其它", null);
         return vo;
     }