From 8a761e00a33f48c3ef545a90b8385740b1090266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Thu, 28 Mar 2024 13:23:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/ProblemmodifyController.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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); }