zh

src/main/java/com/zh/project0512/controller/manage/AdminController.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
@@ -144,9 +145,9 @@ public class AdminController {
         @NotNull(message = "账号id不能为空")
         @Schema(title = "账号id")
         private String id;
-        @NotNull(message = "状态不能为空")
-        @Schema(title = "status",description = "1.启用，2.禁用")
-        private Integer status;
+        @NotNull(message = "open不能为空")
+        @Schema(title = "开启或禁用",description = "open为true为开启；为false为禁用")
+        private boolean open;
     }
 
     @Operation(summary = "切换账户状态")
@@ -154,16 +155,17 @@ public class AdminController {
     @AdminTokenValid
     @AdminCheckAuthorityAnnotation(jurisdictionId = "27")
     public Result switchStatus(@Validated @RequestBody AdminStatusParam param) {
+        int status = param.open?1:2;
         UpdateWrapper<Admin> up = new UpdateWrapper<>();
         up.eq("id", param.getId());
         Admin admin = adminService.getOne(up);
         if (null == admin) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户！");
         }
-        if(admin.getStatus() == param.getStatus()) {
+        if(admin.getStatus() == status) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未发生改动！");
         }
-        up.set(param.getStatus()!=null,"status",param.getStatus() );
+        up.set("status",status );
         up.set("updateAt",LocalDateTime.now());
         return Result.success( adminService.update(up));
     }

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

@@ -47,6 +47,7 @@ public class RankServiceImpl implements IRankService {
         QueryWrapper<Rank> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type", rankListDTO.getType());
         queryWrapper.eq("date_format(dateStart, '%Y-%m')", format);
+        queryWrapper.orderByDesc("value");
         Page<Rank> page = new Page<>(rankListDTO.getPageNum(), rankListDTO.getPageSize());
         IPage<Rank> rankIPage = rankMapper.selectPage(page, queryWrapper);
         List<Rank> records = rankIPage.getRecords();

src/main/resources/mapper/QywxDepartmentUserLinkMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.zh.project0512.mapper.QywxDepartmentUserLinkMapper">
     <select id="getUserRankList" resultType="com.zh.project0512.model.vo.RankListVo">
         select u.openid as linkId,u.name as title,qd.name as subtitle,
-        (sum(IFNULL(v.playNum,0))+sum(IFNULL(v.commendNum,0))+sum(IFNULL(v.collectionNum,0))+sum(IFNULL(v.commentNum,0))) as value
+        (sum(IFNULL(v.playNum,0))+sum(IFNULL(v.commendNum,0))+sum(IFNULL(v.collectionNum,0))+sum(IFNULL(v.commentNum,0))+sum(IFNULL(v.reSendNum,0))+sum(IFNULL(v.recommendNum,0))) as value
         from user as u
-        LEFT JOIN video as v ON u.id = v.userId
+        LEFT JOIN video as v ON u.id = v.userId and v.status &lt;&gt; 3
         LEFT JOIN qywxDepartment as qd on qd.departmentId = u.main_department
         ${ew.SqlSegment}
     </select>