diff --git a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java index e22dd90..905f1ac 100644 --- a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java +++ b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java @@ -178,7 +178,7 @@ public class StatisticsController { default: } } - qw.between("t1.createAt", before, now.plusDays(1)); + qw.between("t2.createAt", before, now.plusDays(1)); IPage page =(param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg,qw) : userEffectRecordsMapper.rankByUser(pg,qw); return Result.success(page, "请求成功"); } } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java index 0c4e9a3..bf0b9be 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java @@ -76,7 +76,7 @@ public class RankUController { Page pg = MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()); QueryWrapper qw = new QueryWrapper<>(); LocalDateTime now = param.getDateTime() == null ? LocalDateTime.now() : param.getDateTime(); - qw.eq("date_format(t1.createAt, '%Y-%m')", now.format(DateTimeFormatter.ofPattern("yyyy-MM"))); + qw.eq("date_format(t2.createAt, '%Y-%m')", now.format(DateTimeFormatter.ofPattern("yyyy-MM"))); IPage page = (param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg, qw) : userEffectRecordsMapper.rankByUser(pg, qw); return Result.success(page.getRecords(), "请求成功"); } diff --git a/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java b/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java index 9efdc38..5a1a568 100644 --- a/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java +++ b/src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java @@ -33,7 +33,6 @@ public interface UserEffectRecordsMapper extends BaseMapper { // "ORDER BY effectValue DESC") @Select("SELECT t1.departmentId,t1.name,IFNULL(sum(t2.effectValue),0) as effectValue from (SELECT t1.*,t2.openid FROM qywxDepartment t1 LEFT JOIN qywxDepartmentUserLink as t2 on t2.departmentId = t1.departmentId) as t1\n" + "INNER JOIN (SELECT t1.openid,IFNULL(sum(t2.effectResultTran),0) as effectValue from user t1 left join userEffectRecords t2 on t2.userId = t1.id GROUP BY openid) as t2 on t2.openid = t1.openid\n" + - "GROUP BY departmentId\n" + "${ew.customSqlSegment} " + "GROUP BY departmentId\n" + "ORDER BY effectValue DESC")