From fbb42d5fbf1b96c71177983e66aa1b62e77d8252 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 2 Feb 2024 18:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=94=B9=E4=B8=BA=E6=8C=89=E7=85=A7=E5=B9=B4=E6=9D=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/controller/WxClockLogController.java | 6 ++---- .../flossom/miniProgram/service/IWxClockLogService.java | 2 +- .../miniProgram/service/impl/WxClockLogServiceImpl.java | 8 +++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java index 813590d..c234f4d 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxClockLogController.java @@ -97,10 +97,8 @@ public class WxClockLogController extends BaseController { * 获取打卡统计 */ @GetMapping("/clockStatistics") - public TableDataInfo clockStatistics(WxClockStatistics wxClockStatistics) { - Integer pageNum = startPage(); - List list = wxClockLogService.clockStatistics(wxClockStatistics, pageNum); - return getDataTable(list); + public R clockStatistics(@RequestParam(value = "year") Integer year) { + return R.ok(wxClockLogService.clockStatistics(year)); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java index 22830d1..3caa599 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxClockLogService.java @@ -17,7 +17,7 @@ public interface IWxClockLogService { List selectWxClockLogList(); - List clockStatistics(WxClockStatistics wxClockStatistics, Integer pageNum); + List clockStatistics(Integer year); void clockStatisticsTimedTask(List userIdList, Integer year, Integer month); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java index 0f47c58..465c823 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxClockLogServiceImpl.java @@ -245,10 +245,12 @@ public class WxClockLogServiceImpl implements IWxClockLogService { } @Override - public List clockStatistics(WxClockStatistics wxClockStatistics, Integer pageNum) { + public List clockStatistics(Integer year) { + WxClockStatistics query = new WxClockStatistics(); + query.setYear(year); // 获取历史统计信息，数据在数据库 - List list = wxClockStatisticsMapper.selectWxClockStatisticsList(wxClockStatistics); - if (list != null && list.size() > 0 && pageNum == 1) { + List list = wxClockStatisticsMapper.selectWxClockStatisticsList(query); + if (list != null && list.size() > 0 && year == LocalDate.now().getYear()) { /* 当前月，则需要从redis中获取排名，计算比例 */ WxClockStatistics isCurrent = list.get(0); // 获取排名