refactor(功能用例): 功能用例联调问题处理

backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml

@@ -192,15 +192,13 @@
     <select id="listByProviderRequest" resultType="io.metersphere.dto.BugProviderDTO">
         SELECT
             b.id id,
-            b.title title,
+            b.title name,
             b.handle_user handleUser,
-            u.`name` name,
             b.`status` status,
             b.tag tag,
             b.create_time createTime
         FROM
             bug b
-                LEFT JOIN `user` u ON b.create_user = u.id
         WHERE
             b.deleted = #{deleted}
           AND b.id NOT IN

backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.java

@@ -16,6 +16,7 @@ public interface ExtBugRelateCaseMapper {
 
     /**
      * 统计缺陷关联的用例数量
+     *
      * @param bugIds 缺陷ID集合
      * @return 缺陷关联DTO
      */
@@ -23,10 +24,11 @@ public interface ExtBugRelateCaseMapper {
 
     /**
      * 缺陷关联用例列表查询
+     *
      * @param request 请求参数
      * @return 缺陷关联用例列表
      */
     List<BugRelateCaseDTO> list(@Param("request") BugRelatedCasePageRequest request);
 
-    List<BugProviderDTO> getAssociateBugs(@Param("request") AssociateBugPageRequest request);
+    List<BugProviderDTO> getAssociateBugs(@Param("request") AssociateBugPageRequest request, @Param("sort") String sort);
 }

backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml

@@ -32,6 +32,13 @@
                 INNER JOIN bug b ON brc.bug_id = b.id
         where b.deleted = false
         <include refid="queryWhereConditionByProvider"/>
+        order by
+        <if test="sort != null and sort != ''">
+            brc.${sort}
+        </if>
+        <if test="sort == null or sort == ''">
+            brc.create_time desc
+        </if>
     </select>
 
     <sql id="queryWhereConditionByProvider">

backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java

@@ -75,7 +75,7 @@ public class AssociateBugProvider implements BaseAssociateBugProvider {
 
     @Override
     public List<BugProviderDTO> hasAssociateBugPage(AssociateBugPageRequest request) {
-        return extBugRelateCaseMapper.getAssociateBugs(request);
+        return extBugRelateCaseMapper.getAssociateBugs(request, request.getSortString());
         //TODO 需要转义状态和处理人属性
     }
 }

backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseRelationshipController.java

@@ -39,7 +39,7 @@ public class FunctionalCaseRelationshipController {
     private FunctionalCaseRelationshipEdgeService functionalCaseRelationshipEdgeService;
 
     @GetMapping("/get-ids/{caseId}")
-    @Operation(summary = "用例管理-功能用例-评审列表-评审详情-获取已关联用例id集合(关联用例弹窗前调用)")
+    @Operation(summary = "用例管理-功能用例-用例详情-前后置关系-获取已关联用例id集合(关联用例弹窗前调用)")
     @CheckOwner(resourceId = "#reviewId", resourceType = "case_review")
     public List<String> getCaseIds(@PathVariable String caseId) {
         return functionalCaseRelationshipEdgeService.getExcludeIds(caseId);

backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalTestCaseController.java

@@ -126,8 +126,7 @@ public class FunctionalTestCaseController {
     @RequiresPermissions(value = {PermissionConstants.FUNCTIONAL_CASE_READ_ADD, PermissionConstants.FUNCTIONAL_CASE_READ_UPDATE, PermissionConstants.FUNCTIONAL_CASE_READ_DELETE}, logical = Logical.OR)
     @CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project")
     public Pager<List<BugProviderDTO>> getAssociateBugList(@Validated @RequestBody AssociateBugPageRequest request) {
-        Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
-                StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "create_time desc");
+        Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize());
         return PageUtils.setPageInfo(page, functionalTestCaseService.hasAssociateBugPage(request));
     }
 }

backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseControllerTests.java

@@ -105,9 +105,12 @@ public class CaseReviewFunctionalCaseControllerTests extends BaseTest {
             put("type", "List");
         }}));
         request.setCombine(map);
-        request.setViewFlag(false);
+        request.setViewFlag(true);
         request.setProjectId("wx_test_project");
         this.requestPostWithOkAndReturn(REVIEW_CASE_PAGE, request);
+        this.requestPostWithOkAndReturn(REVIEW_FUNCTIONAL_CASE_MODULE_COUNT, request);
+        request.setViewFlag(false);
+        this.requestPostWithOkAndReturn(REVIEW_CASE_PAGE, request);
 
         request.setSort(new HashMap<>() {{
             put("createTime", "desc");