diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index cf512d4..074ba14 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -34,6 +34,7 @@ import java.io.File; import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.UUID; @@ -159,6 +160,7 @@ public class UtilsController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.groupBy("u.id"); queryWrapper.orderByDesc("value"); + queryWrapper.eq("date_format(v.creatAt, '%Y-%m')",LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); List rankUserList = qywxDepartmentUserLinkMapper.getUserRankList(queryWrapper); return Result.success(); } diff --git a/src/main/resources/mapper/UserReferenceMapper.xml b/src/main/resources/mapper/UserReferenceMapper.xml index 47c055a..7676d2d 100644 --- a/src/main/resources/mapper/UserReferenceMapper.xml +++ b/src/main/resources/mapper/UserReferenceMapper.xml @@ -27,9 +27,9 @@ SELECT date_format(t7.creatAt, '%Y-%m-%d') dat,t7.creatAt as collectedAt, t1.*,t7.userId,t2.tagId,t3.title as tagTitle,t4.brandId,t5.name as brandName from reference as t1 - right join (SELECT userReference.* from userReference left JOIN user on user.id = userReference.userId WHERE user.openid = #{openid} GROUP BY referenceId) as t7 on t1.id = t7.referenceId - right join referenceTag as t2 on t1.id = t2.referenceId LEFT JOIN tag as t3 on t3.id = t2.tagId - right join referenceBrand as t4 on t1.id = t4.referenceId LEFT JOIN brand as t5 on t5.id = t4.brandId + LEFT join (SELECT userReference.* from userReference left JOIN user on user.id = userReference.userId WHERE user.openid = #{openid} GROUP BY referenceId) as t7 on t1.id = t7.referenceId + LEFT join referenceTag as t2 on t1.id = t2.referenceId LEFT JOIN tag as t3 on t3.id = t2.tagId + LEFT join referenceBrand as t4 on t1.id = t4.referenceId LEFT JOIN brand as t5 on t5.id = t4.brandId where date_format(t7.creatAt, '%Y-%m-%d') in #{item}