third commit by ailanyin

ailanyin-model-mapper/src/main/java/com/ailanyin/mapper/HxHiddenDangerMapper.java

@@ -29,43 +29,11 @@ public interface HxHiddenDangerMapper {
      */
     void insertSelective(HxHiddenDanger hxHiddenDanger);
 
-    /**
-     * 获取所有的存在的类别以及数量
-     *
-     * @param year 年份
-     * @return list
-     */
-    List<Map> getAllCategoryAndCount(Integer year);
+    List<Map<String, Integer>> selectCountGroupByMonth();
 
-    /**
-     * 根据年和整改情况查询个数
-     *
-     * @param alreadyUpdate alreadyUpdate
-     * @param year          year
-     * @return count
-     */
-    Long getCountByMeasures(@Param("alreadyUpdate") String alreadyUpdate, @Param("year") Integer year);
+    List<String> getAllCategoryByYear(Integer nowYear);
 
-    /**
-     * 获取所有车间
-     *
-     * @return list
-     */
-    List<String> getAllWorkshopList();
+    Integer selectCountByCategoryAndYear(@Param("category") String category, @Param("nowYear") Integer nowYear);
 
-    /**
-     * 获取已整改 和 所有
-     * @param workshop 车间
-     * @param alreadyUpdate 已整改
-     * @return map
-     */
-    Map selectWorkShopDangerCount(@Param("workshop") String workshop, @Param("alreadyUpdate") String alreadyUpdate);
-
-    List<String> getAllWorkshopByYear(String year);
-
-    Map selectByWorkShopAndYear(@Param("workshop") String workshop,@Param("year")  String year);
-
-    List<String> getAllMonthByYear(String year);
-
-    Map getAllByMonth(String month);
+    List<Map> selectByYearGroupUnit(String year);
 }