zh

src/main/java/com/zh/project0512/controller/wxApp/RankUController.java

@@ -1,6 +1,7 @@
 package com.zh.project0512.controller.wxApp;
 
 import com.zh.project0512.annotation.tokenValid;
+import com.zh.project0512.model.Rank;
 import com.zh.project0512.model.dto.RankListDTO;
 import com.zh.project0512.model.vo.RankListVo;
 import com.zh.project0512.service.IRankService;
@@ -37,8 +38,8 @@ public class RankUController {
      */
     @Operation(summary = "排行列表")
     @PostMapping("/list")
-    public ResultPageInfo<RankListVo> rankList(@Validated @RequestBody RankListDTO rankListDTO) {
+    public Result rankList(@Validated @RequestBody RankListDTO rankListDTO) {
-        return ResultPageInfo.success(rankService.rankList(rankListDTO), "请求成功");
+        return Result.success(rankService.rankList(rankListDTO), "请求成功");
     }
 
     @Operation(summary = "个人总记录")

src/main/java/com/zh/project0512/mapper/VideoMapper.java

@@ -43,6 +43,7 @@ public interface VideoMapper extends BaseMapper<Video> {
         "sum(t1.reSendNum) as reSendNum ,\n" +
         "sum(t1.recommendNum) as recommendNum \n" +
         " from video as t1" +
-        " inner join user on user.openid = #{openid} and user.id = t1.userId\n")
+        " inner join user on user.openid = #{openid} and user.id = t1.userId\n" +
+        "where t1.status = 2")
     JSONObject record(String openid);
 }

src/main/java/com/zh/project0512/model/dto/RankListDTO.java

@@ -1,5 +1,7 @@
 package com.zh.project0512.model.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -7,6 +9,7 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 排行列表DTO
@@ -36,4 +39,7 @@ public class RankListDTO implements Serializable {
     @Schema(title = "排行榜类型",description = "1.经销商，2.员工")
     @NotNull(message = "排行榜类型不能为空")
     private int type;
+    @Schema(title = "查询年月",description = "时间格式为yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateTime;
 }

src/main/java/com/zh/project0512/service/IRankService.java

@@ -1,5 +1,7 @@
 package com.zh.project0512.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zh.project0512.model.Rank;
 import com.zh.project0512.model.dto.RankListDTO;
 import com.zh.project0512.model.vo.RankListVo;
 import com.zh.project0512.utils.page.PageInfo;
@@ -11,5 +13,5 @@ public interface IRankService {
      * @param rankListDTO 排行列表DTO
      * @return 排行列表 Vo
      */
-    PageInfo<RankListVo> rankList(RankListDTO rankListDTO);
+    IPage<Rank> rankList(RankListDTO rankListDTO);
 }

src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java

@@ -11,6 +11,7 @@ import com.zh.project0512.service.IRankService;
 import com.zh.project0512.utils.PropertyUtils;
 import com.zh.project0512.utils.page.PageInfo;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
@@ -28,7 +29,7 @@ public class RankServiceImpl implements IRankService {
     RankMapper rankMapper;
 
     @Override
-    public PageInfo<RankListVo> rankList(RankListDTO rankListDTO) {
+    public IPage<Rank> rankList( RankListDTO rankListDTO) {
         ArrayList<RankListVo> rankListVoList = new ArrayList<>();
 //        Calendar cal = Calendar.getInstance();
 //        cal.setTime(new Date());
@@ -40,7 +41,7 @@ public class RankServiceImpl implements IRankService {
 //        cal.set(Calendar.MILLISECOND,0);
 //        Date time = cal.getTime();
 //        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-        LocalDateTime now = LocalDateTime.now().minusMonths(1);
+        LocalDateTime now = rankListDTO.getDateTime() ==null ? LocalDateTime.now().minusMonths(1):rankListDTO.getDateTime();
         String format = now.format(DateTimeFormatter.ofPattern("yyyy-MM"));
 
         QueryWrapper<Rank> queryWrapper = new QueryWrapper<>();
@@ -56,6 +57,6 @@ public class RankServiceImpl implements IRankService {
                 rankListVoList.add(rankListVo);
             }
         }
-        return new PageInfo<>(rankIPage.getPages(), rankListVoList, rankIPage.getTotal());
+        return rankIPage;
     }
 }