Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

pom.xml

@@ -12,14 +12,18 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.0.7.RELEASE</version>
+<!--        <version>2.1.13.RELEASE</version>-->
     </parent>
+<!--    <properties>-->
+<!--        <java.version>1.8</java.version>-->
+<!--    </properties>-->
 
     <dependencyManagement>
         <dependencies>
 <!--            <dependency>-->
 <!--                <groupId>com.alibaba.cloud</groupId>-->
 <!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
-<!--                <version>2.0.0.RELEASE</version>-->
+<!--                <version>2.1.4.RELEASE</version>-->
 <!--                <type>pom</type>-->
 <!--                <scope>import</scope>-->
 <!--            </dependency>-->
@@ -28,6 +32,7 @@
                 <artifactId>spring-cloud-dependencies</artifactId>
                 <!--Spring Cloud的版本-->
                 <version>Finchley.SR2</version>
+<!--                <version>Greenwich.SR6</version>-->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -47,6 +47,11 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
             // 根据用户名去查询该用户绑定的公司及下属公司
             List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
+            if(companyList.size() > 0) {
+                Map<String, Object> stringMap = new HashMap<>();
+                stringMap.put("companyId",-1);
+                companyList.add(stringMap);
+            }
             Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
             userInfo.put("dilCompanyList", companyList);
             if (rootCompanyMap != null && rootCompanyMap.get("isListed") != null) {

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -113,6 +113,10 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查人员")
     @PostMapping("/getPersonnelByLike")
     public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String,Object> map) {
+        if("司机".equals(map.get("personnelPost"))) {
+            List<Map<String, Object>> list = universalMapper.getDriverByLike(map);
+            return success(list);
+        }
         List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
         return success(list);
     }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -93,4 +93,6 @@ public interface UniversalMapper {
     @Options(flushCache = Options.FlushCachePolicy.TRUE)
     BigDecimal transRequirementId();
 
+    List<Map<String, Object>> getDriverByLike(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/impl/TestServiceImpl.java

@@ -0,0 +1,36 @@
+//package com.steerinfo.dil.service.impl;
+//
+//import com.steerinfo.dil.feign.AmsFeign;
+//import io.seata.spring.annotation.GlobalTransactional;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * @ClassName TestServiceImpl
+// * @Description TODO
+// * @date 2024-04-22 11:27
+// * @Version 1.0
+// */
+//@Service(value = "testService")
+//public class TestServiceImpl {
+//    @Autowired
+//    AmsFeign amsFeign;
+//
+//
+//    @Transactional(rollbackFor = Exception.class)
+//    public Map<String, Object> test(Map<String, Object> map) {
+//        Map<String, Object> map1 = amsFeign.productionRequirementAdd(map);
+//
+//        Map<String, Object> map2 = amsFeign.getproductionPlanList(new HashMap<>(),null,null,null);
+//
+//        if(true){
+//            int i = 1/0;
+//        }
+//
+//        return map1;
+//    }
+//}

src/main/resources/application-prod.yml

@@ -26,22 +26,22 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8000}
+    url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8000}
+    url: ${RMSFEIGN_URL:172.16.90.202:8060}
 #    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${EMSFEIGN_URL:172.16.90.202:8000}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8000}
+    url: ${REPORTFEIGN_URL:172.16.90.202:80}
 
 
 #远程调用

src/main/resources/bootstrap.yml

@@ -11,8 +11,8 @@ spring:
     encoding: UTF-8
   mvc:
     static-path-pattern:
-
-
+#  main:
+#    allow-bean-definition-overriding: true
 genxml:
   pth: com/agit
 cache:

src/main/resources/com/steerinfo/dil/mapper/CommonMapper.xml

@@ -42,7 +42,9 @@
     </sql>
     <sql id="rootCompanyFilter">
         <if test="rootCompanyMap != null and urlFlag != null and urlFlag != 'null' and urlFlag != ''">
-            AND "rootCompanyId" = #{rootCompanyMap.rootCompanyId}
+            AND ("rootCompanyId" = #{rootCompanyMap.rootCompanyId}
+            OR  #{urlFlag} = (SELECT IS_LISTED FROM RMS_COMPANY WHERE COMPANY_ID = "rootCompanyId")
+            )
         </if>
     </sql>
     <sql id="filterCompanyData">

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -85,24 +85,26 @@
 
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
-        select * from(
-        select
-        RC.SSO_ID "ssoId",
-        RC.SSO_CODE "ssoCode",
-        RC.COMPANY_ID "id",
-        RC.COMPANY_ID   "key",
-        RC.COMPANY_ID "value",
-        <if test="companyType==null">
-            RC.COMPANY_TYPE || '-' ||
-        </if>
-        RC.COMPANY_NAME "label",
-        RC.COMPANY_NAME "text",
-        RC.COMPANY_NAME "companyName",
-        T2 ."rootCompanyId",
-        T2 ."rootCompanyName",
-        'label' "prop"
-        from RMS_COMPANY RC
-        LEFT JOIN (
+        select * from (
+            select * from(
+            select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID "businessCompanyId",
+            RC.COMPANY_ID   "key",
+            RC.COMPANY_ID "value",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName",
+            'label' "prop"
+            from RMS_COMPANY RC
+            LEFT JOIN (
             SELECT "companyId",MAX("level") "rootIndex" FROM
             (
             SELECT
@@ -115,9 +117,9 @@
             CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
             )
             GROUP BY "companyId"
-        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
-        LEFT JOIN
-        (
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
             SELECT
             RC.COMPANY_ID "rootCompanyId",
             RC.COMPANY_NAME "rootCompanyName",
@@ -126,45 +128,55 @@
             FROM
             RMS_COMPANY RC
             CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
-        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
-        <where>
-            DELETED = 0
-            <if test="companyType!=null and companyType!=''">
-                AND RC.COMPANY_TYPE = #{companyType}
-            </if>
-            <if test="companyId!=null and companyId!=''">
-                AND RC.COMPANY_ID = #{companyId}
-            </if>
-            <if test="businessCompanyId!=null and businessCompanyId!=''">
-                AND RC.COMPANY_ID = #{businessCompanyId}
-            </if>
-            <if test="supplierCompanyId!=null and supplierCompanyId!=''">
-                AND RC.COMPANY_ID = #{supplierCompanyId}
-            </if>
-            <if test="receiveCompanyId!=null and receiveCompanyId!=''">
-                AND RC.COMPANY_ID = #{receiveCompanyId}
-            </if>
-            <if test="carrierId!=null and carrierId!=''">
-                AND RC.COMPANY_ID = #{carrierId}
-            </if>
-            <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            <where>
+                DELETED = 0
+                <if test="companyType!=null and companyType!=''">
+                    AND RC.COMPANY_TYPE = #{companyType}
+                </if>
+                <if test="companyId!=null and companyId!=''">
+                    AND RC.COMPANY_ID = #{companyId}
+                </if>
+                <if test="businessCompanyId!=null and businessCompanyId!=''">
+                    AND RC.COMPANY_ID = #{businessCompanyId}
+                </if>
+                <if test="supplierCompanyId!=null and supplierCompanyId!=''">
+                    AND RC.COMPANY_ID = #{supplierCompanyId}
+                </if>
+                <if test="receiveCompanyId!=null and receiveCompanyId!=''">
+                    AND RC.COMPANY_ID = #{receiveCompanyId}
+                </if>
+                <if test="carrierId!=null and carrierId!=''">
+                    AND RC.COMPANY_ID = #{carrierId}
+                </if>
+                <if test="index!=null and index!=''">
+                    AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
+                </if>
+                <if test="isListed !=null and isListed!=''">
+                    AND RC.is_Listed IS NOT NULL
+                </if>
+
+            </where>
+            <if test="noRow == null">
+                order by LENGTH(company_name)
             </if>
-            <if test="isListed !=null and isListed!=''">
-                AND RC.is_Listed IS NOT NULL
+            )
+            <where>
+            <if test="companyType != null and companyType == '业务单位'">
+                <include refid="com.steerinfo.dil.mapper.CommonMapper.rootCompanyFilter"></include>
+                <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
             </if>
-        </where>
-        <if test="noRow == null">
-            order by LENGTH(company_name)
+            </where>
             FETCH NEXT 10 ROWS ONLY
-        </if>
         )
         <if test="id!=null and id.size>0">
         UNION
-            select
+            select * from
+            (select
             RC.SSO_ID "ssoId",
             RC.SSO_CODE "ssoCode",
             RC.COMPANY_ID "id",
+            RC.COMPANY_ID "businessCompanyId",
             RC.COMPANY_ID   "key",
             RC.COMPANY_ID "value",
             <if test="companyType==null">
@@ -206,6 +218,7 @@
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
+            order by LENGTH(company_name))
         </if>
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">
@@ -285,8 +298,8 @@
         select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
-        OPERATION_POINT_NAME "label",
-        OPERATION_POINT_NAME "text"
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
 
         from RMS_OPERATION_POINT
         <where>
@@ -301,7 +314,7 @@
                 AND OPERATION_POINT_ID =  #{shippingPointId}
             </if>
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
+                AND REGEXP_LIKE(OPERATION_POINT_CODE || OPERATION_POINT_NAME, #{index})
             </if>
             <if test="sourceFlag != null and sourceFlag !=''">
                 AND ALTERNATE_FIELDS1 = #{sourceFlag}
@@ -313,8 +326,8 @@
         UNION select
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
-        OPERATION_POINT_NAME "label",
-        OPERATION_POINT_NAME "text"
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
         from RMS_OPERATION_POINT
         where  OPERATION_POINT_ID in
         <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -328,12 +341,29 @@
     select * from (
         select * from (
         select
+        distinct
         PERSONNEL_ID "personnelId",
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
         PERSONNEL_PHONE "personnelPhone",
         INNNER_CODE "innerCode",
-        to_char(SSO_ID) "ssoId",
+        to_char(SSO_ID) "ssoId",,
+        CASE WHEN RC.COMPANY_TYPE = '业务单位'
+        THEN RC.COMPANY_ID
+        else -1
+        END "businessCompanyId",
+        CASE WHEN RC.COMPANY_TYPE = '承运商'
+        THEN RC.COMPANY_ID
+        else -1
+        END "carrierId",
+        CASE WHEN RC.COMPANY_TYPE = '发货单位'
+        THEN RC.COMPANY_ID
+        else -1
+        END "shippingCompanyId",
+        CASE WHEN RC.COMPANY_TYPE = '收货客户'
+        THEN RC.COMPANY_ID
+        else -1
+        END "receivingCompanyId",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
@@ -344,6 +374,10 @@
         </if>
         FROM
         RMS_PERSONNEL RP
+        LEFT JOIN RMS_PERSONNEL_COMPANY RPC
+        ON RPC.PERSONNEL_ID = RP.PERSONNEL_ID
+        LEFT JOIN RMS_COMPANY RC
+        ON RC.COMPANY_ID = RPC.COMPANY_ID
         <if test="capacityId!=null and capacityId!=''">
             LEFT JOIN (
             SELECT DRIVER_ID "driverId",
@@ -431,6 +465,22 @@
         RCA .CAPACITY_ID "capacityId",
         RCA .CAPACITY_ID "id",
         RCA .CAPACITY_ID "value",
+        CASE WHEN RC.COMPANY_TYPE = '业务单位'
+        THEN RC.COMPANY_ID
+        else -1
+        END "businessCompanyId",
+        CASE WHEN RC.COMPANY_TYPE = '承运商'
+        THEN RC.COMPANY_ID
+        else -1
+        END "carrierId",
+        CASE WHEN RC.COMPANY_TYPE = '发货单位'
+        THEN RC.COMPANY_ID
+        else -1
+        END "shippingCompanyId",
+        CASE WHEN RC.COMPANY_TYPE = '收货客户'
+        THEN RC.COMPANY_ID
+        else -1
+        END "receivingCompanyId",
         CASE WHEN RCA.REMARK1 is null
         then RCA.CAPACITY_NUMBER
         else RCA.REMARK1
@@ -484,9 +534,6 @@
         <if test="capacityTypeId !=null">
             and RCT.CAPACITY_TYPE_ID = #{capacityTypeId}
         </if>
-        <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengYunShang')">
-                AND RC.SSO_CODE = #{orgCode}
-            </if>
             <if test="capacityType != null and capacityType != '' ">
                 AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
             </if>
@@ -523,6 +570,22 @@
             RCA .CAPACITY_ID "capacityId",
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
+            CASE WHEN RC.COMPANY_TYPE = '业务单位'
+            THEN RC.COMPANY_ID
+            else -1
+            END "businessCompanyId",
+            CASE WHEN RC.COMPANY_TYPE = '承运商'
+            THEN RC.COMPANY_ID
+            else -1
+            END "carrierId",
+            CASE WHEN RC.COMPANY_TYPE = '发货单位'
+            THEN RC.COMPANY_ID
+            else -1
+            END "shippingCompanyId",
+            CASE WHEN RC.COMPANY_TYPE = '收货客户'
+            THEN RC.COMPANY_ID
+            else -1
+            END "receivingCompanyId",
             CASE WHEN RCA.REMARK1 is null
             then RCA.CAPACITY_NUMBER
             else RCA.REMARK1
@@ -574,6 +637,9 @@
             </foreach>
         </if>
     )
+    <where>
+        <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+    </where>
     <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
         ORDER BY "countNumber" DESC
     </if>
@@ -1452,4 +1518,148 @@
             </foreach>
         </if>
     </select>
+    <select id="getDriverByLike" resultType="java.util.Map">
+        select * from (
+        select * from (
+        select * from (
+        select
+        distinct
+        RP.PERSONNEL_ID "personnelId",
+        RP.PERSONNEL_NAME "personnelName",
+        RP.PERSONNEL_POST "personnelPost",
+        RP.PERSONNEL_PHONE "personnelPhone",
+        RP.INNNER_CODE "innerCode",
+        to_char(RP.SSO_ID) "ssoId",
+        CASE WHEN RC.COMPANY_TYPE = '业务单位'
+        THEN RC.COMPANY_ID
+        else -1
+        END "businessCompanyId",
+        CASE WHEN RC.COMPANY_TYPE = '承运商'
+        THEN RC.COMPANY_ID
+        else -1
+        END "carrierId",
+        CASE WHEN RC.COMPANY_TYPE = '发货单位'
+        THEN RC.COMPANY_ID
+        else -1
+        END "shippingCompanyId",
+        CASE WHEN RC.COMPANY_TYPE = '收货客户'
+        THEN RC.COMPANY_ID
+        else -1
+        END "receivingCompanyId",
+        RP.PERSONNEL_ID "id",
+        RP.PERSONNEL_ID "value",
+        RP.PERSONNEL_NAME "label",
+        RP.PERSONNEL_NAME "text",
+        'personnelName' "prop"
+        <if test="capacityId!=null and capacityId!=''">
+            ,NVL(T ."countNumber",0) "countNumber"
+        </if>
+        FROM
+        RMS_PERSONNEL RP
+        LEFT JOIN RMS_PERSONNEL_COMPANY RPC
+        ON RPC.PERSONNEL_ID = RP.PERSONNEL_ID
+        LEFT JOIN RMS_COMPANY RC
+        ON RC.COMPANY_ID = RPC.COMPANY_ID
+        <if test="capacityId!=null and capacityId!=''">
+            LEFT JOIN (
+            SELECT DRIVER_ID "driverId",
+            COUNT(DRIVER_ID) "countNumber"
+            FROM OMS_TRANS_ORDER
+            WHERE CAPACITY_ID = #{capacityId}
+            GROUP BY DRIVER_ID
+            ) T ON T."driverId" = RP .PERSONNEL_ID
+        </if>
+        WHERE RP.DELETED = 0
+        AND RC.COMPANY_TYPE = '承运商'
+        <if test="isNC!=null">
+            AND RP.SOURCE_ID IS NOT NULL
+        </if>
+        )
+        <where>
+            <if test="personnelPost!=null and personnelPost!=''">
+                AND "personnelPost" = #{personnelPost}
+            </if>
+            <if test="personnelId!=null and personnelId!=''">
+                AND "personnelId" = #{personnelId})
+            </if>
+            <if test="driverId!=null and driverId!=''">
+                AND "personnelId" = #{driverId})
+            </if>
+            <if test="driverId2!=null and driverId2!=''">
+                AND "personnelId" = #{driverId2})
+            </if>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="lastIndex!=null">
+                and "personnelId" &lt; #{lastIndex}
+            </if>
+        </where>
+        <if test="capacityId!=null and capacityId!=''">
+            ORDER BY "countNumber" DESC
+        </if>
+        <if test="!(capacityId!=null and capacityId!='')">
+            order by "personnelId" desc
+        </if>
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            select
+            RP.PERSONNEL_ID "personnelId",
+            RP.PERSONNEL_NAME "personnelName",
+            RP.PERSONNEL_POST "personnelPost",
+            RP.PERSONNEL_PHONE "personnelPhone",
+            RP.INNNER_CODE "innerCode",
+            to_char(RP.SSO_ID) "ssoId",
+            RP.PERSONNEL_ID "id",
+            RP.PERSONNEL_ID "value",
+            RP.PERSONNEL_NAME "label",
+            RP.PERSONNEL_NAME "text",
+            CASE WHEN RC.COMPANY_TYPE = '业务单位'
+            THEN RC.COMPANY_ID
+            else -1
+            END "businessCompanyId",
+            CASE WHEN RC.COMPANY_TYPE = '承运商'
+            THEN RC.COMPANY_ID
+            else -1
+            END "carrierId",
+            CASE WHEN RC.COMPANY_TYPE = '发货单位'
+            THEN RC.COMPANY_ID
+            else -1
+            END "shippingCompanyId",
+            CASE WHEN RC.COMPANY_TYPE = '收货客户'
+            THEN RC.COMPANY_ID
+            else -1
+            END "receivingCompanyId",
+            'personnelName' "prop"
+            <if test="capacityId!=null and capacityId!=''">
+                ,NVL(T ."countNumber",0) "countNumber"
+            </if>
+            from RMS_PERSONNEL RP
+            LEFT JOIN RMS_PERSONNEL_COMPANY RPC
+            ON RPC.PERSONNEL_ID = RP.PERSONNEL_ID
+            LEFT JOIN RMS_COMPANY RC
+            ON RC.COMPANY_ID = RPC.COMPANY_ID
+            <if test="capacityId!=null and capacityId!=''">
+                LEFT JOIN (
+                SELECT DRIVER_ID "driverId",
+                COUNT(DRIVER_ID) "countNumber"
+                FROM OMS_TRANS_ORDER
+                WHERE CAPACITY_ID = #{capacityId}
+                GROUP BY DRIVER_ID
+                ) T ON T."driverId" = RP .PERSONNEL_ID
+            </if>
+            WHERE RP.PERSONNEL_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
+        )
+        <where>
+            <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
+        </where>
+        <if test="capacityId!=null and capacityId!=''">
+            ORDER BY "countNumber" DESC
+        </if>
+    </select>
 </mapper>