diff --git a/src/main/java/com/zh/project0512/controller/ScheduleController.java b/src/main/java/com/zh/project0512/controller/ScheduleController.java index 32dc197..adae4c7 100644 --- a/src/main/java/com/zh/project0512/controller/ScheduleController.java +++ b/src/main/java/com/zh/project0512/controller/ScheduleController.java @@ -53,6 +53,14 @@ public class ScheduleController { @Scheduled(cron = "0 0 0 1 1/1 ?") public void taskRank() { + //获取开始时间和结束时间 + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + cal.add(Calendar.DAY_OF_MONTH,-1); + cal.set(Calendar.DAY_OF_MONTH,1); + Date timeStart = cal.getTime(); + cal.getActualMaximum(Calendar.DAY_OF_MONTH); + Date timeEnd = cal.getTime(); //获取员工排名进排名数据库 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.groupBy("u.id"); @@ -62,9 +70,9 @@ public class ScheduleController { for (RankListVo rankListVo : rankList) { //查询是否有上一月记录,如果有就减去上一月传播值,没有则直接添加 QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("link_id",rankListVo.getLinkId()); + queryWrapper2.eq("linkId",rankListVo.getLinkId()); queryWrapper2.eq("type",2);//2.员工 - queryWrapper2.orderByDesc("date_start"); + queryWrapper2.orderByDesc("dateStart"); queryWrapper2.last("limit 1"); Rank rank = rankMapper.selectOne(queryWrapper2); if (rank != null){ @@ -72,13 +80,6 @@ public class ScheduleController { } Rank rank2 = new Rank(); PropertyUtils.copyProperties(rankListVo,rank2); - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date()); - cal.add(Calendar.DAY_OF_MONTH,-1); - cal.set(Calendar.DAY_OF_MONTH,1); - Date timeStart = cal.getTime(); - cal.getActualMaximum(Calendar.DAY_OF_MONTH); - Date timeEnd = cal.getTime(); rank2.setDateStart(timeStart); rank2.setDateEnd(timeEnd); rankMapper.insert(rank2); diff --git a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java index 9322da3..250e76f 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java @@ -34,7 +34,7 @@ public class RankServiceImpl implements IRankService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type",rankListDTO.getType()); - queryWrapper.eq("date_start",time); + queryWrapper.eq("dateStart",time); Page page = new Page<>(rankListDTO.getPageNum(), rankListDTO.getSize()); IPage rankIPage = rankMapper.selectPage(page, queryWrapper); List records = rankIPage.getRecords();