Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java

@@ -38,7 +38,7 @@

    String getLastTimeByDeptId(@Param("deptId")Long deptId);

    String getLastTimeByDeptIds(@Param("deptIdList")List<Long> deptIdList);
    List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIds(@Param("deptIdList")List<Long> deptIdList);

    List<EmergencyExecuteCountDO> getCountByDeptIdsAndTime(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("deptIds")List<Long> deptIds);

@@ -46,4 +46,7 @@

    List<EmergencyExecuteCountDO> getCountByDeptIdAndYear(@Param("year")Integer year, @Param("deptId")Long deptId);

    List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIdsAndTime(@Param("deptIdList")List<Long> deptIdList, @Param("startTime")String startTime, @Param("endTime")String endTime);

    String getLastTimeByDeptIdAndTime(@Param("deptId")Long deptId, @Param("startTime")String startTime, @Param("endTime")String endTime);
}