From bf765e6c51a81d9220a8c08006c7d95eb34f2408 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 4 Nov 2024 14:51:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E8=84=91=E5=9B=BE=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=84=91=E5=9B=BE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E4=BE=8B=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ExtFunctionalCaseMapper.java       |  4 +-
 .../mapper/ExtFunctionalCaseMapper.xml        | 14 ++++
 .../request/FunctionalCaseMindRequest.java    | 67 +++++++++++++++++++
 .../service/FunctionalCaseMinderService.java  |  4 +-
 .../FunctionalCaseMinderControllerTest.java   | 20 ++++--
 5 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java
index 21fdaf0622..d9177b307e 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.java
@@ -100,9 +100,9 @@ public interface ExtFunctionalCaseMapper {
     /**
      * 根据模块ID获取用例评审脑图展示数据
      */
-    List<FunctionalCaseMindDTO> getMinderCaseReviewList(@Param("request") FunctionalCaseReviewMindRequest request, @Param("deleted") boolean delete, @Param("userId") String userId, @Param("viewStatusUserId") String viewStatusUserId);
+    List<FunctionalCaseMindDTO> getMinderCaseReviewList(@Param("request") FunctionalCaseReviewMindRequest request, @Param("deleted") boolean delete, @Param("userId") String userId, @Param("viewStatusUserId") String viewStatusUserId, @Param("sort") String sort);
 
-    List<FunctionalCaseMindDTO> getMinderTestPlanList(@Param("request") FunctionalCasePlanMindRequest request, @Param("deleted") boolean delete);
+    List<FunctionalCaseMindDTO> getMinderTestPlanList(@Param("request") FunctionalCasePlanMindRequest request, @Param("deleted") boolean delete, @Param("sort") String sort);
 
     List<FunctionalCaseMindDTO> getMinderCollectionList(@Param("request") FunctionalCaseCollectionMindRequest request, @Param("deleted") boolean delete);
 
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index db91433c9d..420bc60431 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -760,6 +760,13 @@
         fc.project_Id = #{request.projectId}
         AND
         fc.module_id = #{request.moduleId}
+        order by
+        <if test="sort != null and sort != ''">
+            fc.${sort}
+        </if>
+        <if test="sort == null or sort == ''">
+            fc.pos desc
+        </if>
     </select>
 
     <select id="getMinderTestPlanList" resultType="io.metersphere.functional.dto.FunctionalCaseMindDTO">
@@ -788,6 +795,13 @@
         fc.project_Id = #{request.projectId}
         AND
         fc.module_id = #{request.moduleId}
+        order by
+        <if test="sort != null and sort != ''">
+            fc.${sort}
+        </if>
+        <if test="sort == null or sort == ''">
+            fc.pos desc
+        </if>
     </select>
 
     <select id="getMinderCollectionList" resultType="io.metersphere.functional.dto.FunctionalCaseMindDTO">
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseMindRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseMindRequest.java
index c19767180a..ed0b2f654a 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseMindRequest.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseMindRequest.java
@@ -1,9 +1,15 @@
 package io.metersphere.functional.request;
 
+import com.google.common.base.CaseFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
 
 @Data
 public class FunctionalCaseMindRequest {
@@ -17,4 +23,65 @@ public class FunctionalCaseMindRequest {
     @Min(value = 1, message = "当前页码必须大于0")
     @Schema(description =  "当前页码")
     private int current;
+
+    @Schema(description =  "排序字段（model中的字段 : asc/desc）")
+    private Map<@Valid @Pattern(regexp = "^[A-Za-z]+$") String, @Valid @NotBlank String> sort;
+
+
+    public String getSortString() {
+        if (sort == null || sort.isEmpty()) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : sort.entrySet()) {
+            String column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, entry.getKey());
+            sb.append(column)
+                    .append(StringUtils.SPACE)
+                    .append(StringUtils.equalsIgnoreCase(entry.getValue(), "DESC") ? "DESC" : "ASC")
+                    .append(",");
+        }
+        return sb.substring(0, sb.length() - 1);
+    }
+
+    public String getSortString(String defaultColumn, String tableAliseName) {
+        if (sort == null || sort.isEmpty()) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : sort.entrySet()) {
+            String column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, entry.getKey());
+            sb.append(tableAliseName)
+                    .append(".")
+                    .append(column)
+                    .append(StringUtils.SPACE)
+                    .append(StringUtils.equalsIgnoreCase(entry.getValue(), "DESC") ? "DESC" : "ASC")
+                    .append(",")
+                    .append(tableAliseName)
+                    .append(".")
+                    .append(defaultColumn)
+                    .append(StringUtils.SPACE)
+                    .append(StringUtils.equalsIgnoreCase(entry.getValue(), "DESC") ? "DESC" : "ASC");
+            return sb.toString();
+        }
+        return null;
+    }
+
+    public String getSortString(String defaultColumn) {
+        if (sort == null || sort.isEmpty()) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : sort.entrySet()) {
+            String column = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, entry.getKey());
+            sb.append(column)
+                    .append(StringUtils.SPACE)
+                    .append(StringUtils.equalsIgnoreCase(entry.getValue(), "DESC") ? "DESC" : "ASC")
+                    .append(",")
+                    .append(defaultColumn)
+                    .append(StringUtils.SPACE)
+                    .append(StringUtils.equalsIgnoreCase(entry.getValue(), "DESC") ? "DESC" : "ASC");
+            return sb.toString();
+        }
+        return null;
+    }
 }
diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
index a5e9babbcd..4a37ef7b7f 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
@@ -1262,7 +1262,7 @@ public class FunctionalCaseMinderService {
     public List<FunctionalMinderTreeDTO> getReviewMindFunctionalCase(FunctionalCaseReviewMindRequest request, boolean deleted, String userId, String viewStatusUserId) {
         List<FunctionalMinderTreeDTO> list = new ArrayList<>();
         //查出当前模块下的所有用例
-        List<FunctionalCaseMindDTO> functionalCaseMindDTOList = extFunctionalCaseMapper.getMinderCaseReviewList(request, deleted, userId, viewStatusUserId);
+        List<FunctionalCaseMindDTO> functionalCaseMindDTOList = extFunctionalCaseMapper.getMinderCaseReviewList(request, deleted, userId, viewStatusUserId, request.getSortString());
         List<String> fieldIds = getFieldIds(request.getProjectId());
         List<FunctionalCaseCustomField> caseCustomFieldList = extFunctionalCaseMapper.getCaseCustomFieldList(request, deleted, fieldIds);
         Map<String, String> priorityMap = caseCustomFieldList.stream().collect(Collectors.toMap(FunctionalCaseCustomField::getCaseId, FunctionalCaseCustomField::getValue));
@@ -1279,7 +1279,7 @@ public class FunctionalCaseMinderService {
             String substring = request.getModuleId().substring(i + 1);
             request.setModuleId(substring);
         }
-        List<FunctionalCaseMindDTO> functionalCaseMindDTOList = extFunctionalCaseMapper.getMinderTestPlanList(request, deleted);
+        List<FunctionalCaseMindDTO> functionalCaseMindDTOList = extFunctionalCaseMapper.getMinderTestPlanList(request, deleted, request.getSortString());
         List<String> fieldIds = getFieldIds(request.getProjectId());
         List<FunctionalCaseCustomField> caseCustomFieldList = extFunctionalCaseMapper.getCaseCustomFieldList(request, deleted, fieldIds);
         Map<String, String> priorityMap = caseCustomFieldList.stream().collect(Collectors.toMap(FunctionalCaseCustomField::getCaseId, FunctionalCaseCustomField::getValue));
diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseMinderControllerTest.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseMinderControllerTest.java
index 3feafd7d83..5342f60278 100644
--- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseMinderControllerTest.java
+++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseMinderControllerTest.java
@@ -1,7 +1,10 @@
 package io.metersphere.functional.controller;
 
 import io.metersphere.functional.domain.*;
-import io.metersphere.functional.dto.*;
+import io.metersphere.functional.dto.CaseCustomFieldDTO;
+import io.metersphere.functional.dto.FunctionalCaseStepDTO;
+import io.metersphere.functional.dto.FunctionalMinderTreeDTO;
+import io.metersphere.functional.dto.MinderOptionDTO;
 import io.metersphere.functional.mapper.*;
 import io.metersphere.functional.request.*;
 import io.metersphere.plan.domain.TestPlanCaseExecuteHistory;
@@ -28,9 +31,7 @@ import org.springframework.test.context.jdbc.SqlConfig;
 import org.springframework.test.web.servlet.MvcResult;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -82,7 +83,12 @@ public class FunctionalCaseMinderControllerTest extends BaseTest {
         FunctionalCaseMindRequest request = new FunctionalCaseMindRequest();
         request.setProjectId("project-case-minder-test");
         request.setCurrent(1);
+        Map<String,String>sort = new HashMap<>();
+        sort.put("name","desc");
+        request.setSort(sort);
         MvcResult mvcResultPage = this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_LIST_URL, request);
+        request.getSortString("name", "desc");
+        request.getSortString("name");
         Pager<List<FunctionalMinderTreeDTO>> tableData = JSON.parseObject(JSON.toJSONString(
                         JSON.parseObject(mvcResultPage.getResponse().getContentAsString(StandardCharsets.UTF_8), ResultHolder.class).getData()),
                 Pager.class);
@@ -397,6 +403,9 @@ public class FunctionalCaseMinderControllerTest extends BaseTest {
         request.setModuleId("TEST_MINDER_MODULE_ID_GYQ4");
         request.setReviewId("TEST_MINDER_REVIEW_ID_GYQ");
         request.setCurrent(1);
+        Map<String,String> map = new HashMap<>();
+        map.put("name", "desc");
+        request.setSort(map);
         MvcResult mvcResultPage = this.requestPostWithOkAndReturn(FUNCTIONAL_CASE_REVIEW_LIST_URL, request);
         Pager<List<FunctionalMinderTreeDTO>> tableData = JSON.parseObject(JSON.toJSONString(
                         JSON.parseObject(mvcResultPage.getResponse().getContentAsString(StandardCharsets.UTF_8), ResultHolder.class).getData()),
@@ -428,6 +437,9 @@ public class FunctionalCaseMinderControllerTest extends BaseTest {
         request.setModuleId("TEST_MINDER_MODULE_ID_GYQ4");
         request.setPlanId("TEST_MINDER_PLAN_ID_1");
         request.setCurrent(1);
+        Map<String,String> map = new HashMap<>();
+        map.put("name", "desc");
+        request.setSort(map);
         TestPlanCaseExecuteHistory executeHistory = new TestPlanCaseExecuteHistory();
         String nextStr = IDGenerator.nextStr();
         executeHistory.setId(nextStr);