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); // 获取排名