From 8213ea534c6b55f957414758038ca13f0a243ce4 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 18:59:23 +0800 Subject: [PATCH] zh --- .../manage/ReferenceController.java | 2 +- .../serviceImpl/RankServiceImpl.java | 23 ++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java index 0dc5965..b2d6783 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -65,7 +65,7 @@ public class ReferenceController { @Schema(title = "素材分组id",description = "0为未分组") private Integer groupId; @Schema(title = "文件地址列表") - @NotNull(message = "fileUrl不能为空") + @NotNull(message = "fileUrl列表不能为空") private List fileUrlList; @Schema(title = "封面图片地址",description = "视频文件请上传封面图片") private String coverUrl; diff --git a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java index bc34d46..15a2bbf 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java @@ -13,8 +13,6 @@ import com.zh.project0512.utils.page.PageInfo; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -28,20 +26,19 @@ public class RankServiceImpl implements IRankService { @Override public PageInfo rankList(RankListDTO rankListDTO) { ArrayList rankListVoList = new ArrayList<>(); -// Calendar cal = Calendar.getInstance(); -// cal.setTime(new Date()); -// cal.add(Calendar.MONTH,-1); -// cal.set(Calendar.DAY_OF_MONTH,1); -// cal.set(Calendar.HOUR_OF_DAY, 0); -// cal.set(Calendar.MINUTE, 0); -// cal.set(Calendar.SECOND, 0); -// cal.set(Calendar.MILLISECOND,0); -// Date time = cal.getTime(); - LocalDate now = LocalDate.now().minusMonths(1); + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + cal.add(Calendar.MONTH,-1); + cal.set(Calendar.DAY_OF_MONTH,1); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND,0); + Date time = cal.getTime(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type",rankListDTO.getType()); - queryWrapper.eq("dateStart", now.atStartOfDay()); + queryWrapper.eq("dateStart",time); Page page = new Page<>(rankListDTO.getPageNum(), rankListDTO.getPageSize()); IPage rankIPage = rankMapper.selectPage(page, queryWrapper); List records = rankIPage.getRecords();