From 0c21bcabf9aa9ab757e3d831b2734af6ae6267c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Mon, 24 Feb 2025 15:05:54 +0800 Subject: [PATCH] =?UTF-8?q?0.5.1=20=E6=9B=B4=E6=96=B0=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/bst/project/domain/ProjectVO.java | 3 +++ .../com/ruoyi/bst/project/mapper/ProjectMapper.xml | 10 ++++++++++ .../main/java/com/ruoyi/web/bst/ProjectController.java | 2 ++ 3 files changed, 15 insertions(+) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/project/domain/ProjectVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/project/domain/ProjectVO.java index 3d856d3..018fa78 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/project/domain/ProjectVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/project/domain/ProjectVO.java @@ -37,4 +37,7 @@ public class ProjectVO extends Project{ @ApiModelProperty("项目成员列表(需组装)") private List memberList; + + @ApiModelProperty("排序分数") + private Integer sortScore; } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/project/mapper/ProjectMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/project/mapper/ProjectMapper.xml index 1ada96a..55b60e6 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/project/mapper/ProjectMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/project/mapper/ProjectMapper.xml @@ -9,6 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + case + when bp.status = 'DEVELOPMENT_OVERDUE' then 3 + when bp.status = 'IN_PROGRESS' then 2 + else 1 + end + + select bp.id, @@ -33,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp.accept_time, bp.dev_overdue, bp.member_ids, + as sort_score, su.nick_name as owner_name, sf.nick_name as follow_name, sc.nick_name as create_name, diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ProjectController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ProjectController.java index da78ce2..229b0cf 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ProjectController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ProjectController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.github.pagehelper.PageHelper; import com.ruoyi.bst.project.domain.Project; import com.ruoyi.bst.project.domain.ProjectQuery; import com.ruoyi.bst.project.domain.ProjectVO; @@ -60,6 +61,7 @@ public class ProjectController extends BaseController public TableDataInfo list(ProjectQuery query) { startPage(); + PageHelper.orderBy("sort_score desc, create_time desc"); startOrderBy(); query.setScope(true); List list = projectService.selectProjectList(query);