单位配置 bug修复

fengxiang

2018-06-25 a73922c2cc8e4eaf759d50ff956e8f84935fffed

 src/main/java/com/moral/controller/ReportController.java

@@ -82,9 +82,17 @@
   @GetMapping("alarm-year")

   public ResultBean<List<Integer>> getAlarmDataByYear(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      List<Integer> alarmDataByYear = alarmDailyService.getAlarmDataByYear(parameters);

      List<Integer> result = alarmDailyService.getAlarmDataByYear(parameters);

      

      return new ResultBean<List<Integer>>(alarmDataByYear);

      return new ResultBean<List<Integer>>(result);

   }



   @GetMapping("alarm-month")

   public ResultBean<List<Map<String, Object>>> getAlarmDataByMonth(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      List<Map<String, Object>> result = alarmDailyService.getAlarmDataByMonth(parameters);

		
      return new ResultBean<List<Map<String, Object>>>(result);

   }



}