Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java

@@ -28,5 +28,10 @@

    List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds);

    List<EmergencyDrillExecuteCountRPC> selectByDayAndDept(String startTime, String endTime, List<Long> deptIds);

    List<EmergencyDrillExecuteCountRPC> selectByMonthAndDeptForIntegerMonth(String startTime, String endTime, List<Long> deptIds);

    String selectEmergencyDrillExecuteIntervalTimeByDeptId(Long deptId);

}