diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java index bef7f7ee..fd32d675 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java @@ -210,13 +210,17 @@ public class ProblemmodifyController extends BaseController { where.setPrjIds(getProjectIds()); } } - Map> map=new HashMap<>(); - map.put("today",smzSspProblemmodifyService.countByDate(where)); + + Map>> map=new HashMap<>(); + //map.put("today",smzSspProblemmodifyService.countByDate(where)); + map.put("today",smzSspProblemmodifyService.countByDateNew(where)); Date[] dts=DateUtils.getCurrentWeekDate(); where.setStartDate(dts[0]); where.setEndDate(dts[1]); - map.put("week",smzSspProblemmodifyService.countByDateRange(where)); - map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckState(where)); + //map.put("week",smzSspProblemmodifyService.countByDateRange(where)); + map.put("week",smzSspProblemmodifyService.countByDateRangeNew(where)); + //各类型整改、未整改数量统计 + map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckStateNew(where)); redisCache.setCacheObject(key, map, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(map); }