feat: There is no way the,

2021-11-13 22:37:24 +08:00
parent 8c6a7aba27
commit 01568460ca
12 changed files with 380 additions and 313 deletions
@@ -73,7 +73,28 @@
        SAR_STANDARDS_INFO.creation_time,
        SAR_STANDARDS_INFO.modify_time,
        SAR_STANDARDS_INFO.STAND_SYSTEM,
-        SAR_STANDARDS_INFO.IS_RELATE_ACCESS
+        SAR_STANDARDS_INFO.IS_RELATE_ACCESS,
+        SAR_STAND_ATTR_INFO.CHJL AS CHJL,
+        dicstandSort.DIC_TYPE_NAME AS standSortShow,
+        dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
+        (
+        CASE
+        WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01'
+        ELSE SAR_STAND_ATTR_INFO.SSRQ
+        END
+        ) AS SSRQ,
+        (
+        CASE
+        WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01'
+        ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ
+        END
+        ) AS ZCCSSRQ,
+        (
+        CASE
+        WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01'
+        ELSE SAR_STAND_ATTR_INFO.XCXSSRQ
+        END
+        ) AS XCXSSRQ
    </sql>

    <sql id="Base_Column_List_Show" >
@@ -566,9 +587,12 @@
    </sql>

    <sql id="standSort_in">
+        ORDER BY
+        <if test='page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != ""'>
+            ${page.orderByA} ${page.order1},
+        </if>
        <if test='page.standType != null and page.standType == "INLAND"'>
-            ORDER BY
-            CASE tmp_tb.stand_sort
+            CASE sar_standards_info.stand_sort
            when 'GB' THEN 0
            when 'GB/T' THEN 1
            when 'QC/T' THEN 2
@@ -579,11 +603,10 @@
            when 'HJ' THEN 7
            ELSE 8
            END,
-            tmp_tb.stand_sort ASC
+            sar_standards_info.stand_sort ASC,sar_standards_info.id
        </if>
        <if test='page.standType != null and page.standType == "FOREIGN"'>
-            ORDER BY
-            CASE tmp_tb.stand_sort
+            CASE sar_standards_info.stand_sort
            when 'ECE' THEN 0
            when 'EU' THEN 1
            when 'EC' THEN 2
@@ -610,7 +633,7 @@
            when 'ADR' THEN 23
            ELSE 24
            END,
-            tmp_tb.stand_sort ASC
+            sar_standards_info.stand_sort ASC,sar_standards_info.id
        </if>
    </sql>
    <sql id="standSort_out">
@@ -709,6 +732,14 @@

    <sql id="SarStandardsInfo_in_left_2">
        left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
        where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
        <trim suffixOverrides=",">
            <!-- 标准分类 国内标准，国外标准  必要搜索项                 -->
@@ -820,6 +851,21 @@
                and TS_PERSON_COLLECT.user_id=#{page.userId}
                )
            </if>
+
+            <!-- out -->
+            <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ is not null
+            </if>
+            <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
+            </if>
+            <!--适用车型-->
+            <if test="page.applyArctic != null and page.applyArctic != ''">
+                and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
+            </if>
+            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
+                and (${page.advanceSearchStr})
+            </if>
        </trim>
    </sql>

@@ -935,80 +981,13 @@
        </trim>
    </sql>
    <sql id="SarStandardsInfo_out_left">
-        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
-        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
-        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
-        dicstandTextStatus.dic_type_code = a.text_status
-        AND dicstandTextStatus.dic_id IS NOT NULL
-        AND dicstandTextStatus.valid_flag = 0
-        )
-        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = a.id and SAR_STAND_ATTR_INFO.valid_flag=0)
-        where 1=1
-        <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
-            and SAR_STAND_ATTR_INFO.GXHBQ is not null
-        </if>
-        <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
-            and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
-        </if>
-        <!--适用车型-->
-        <if test="page.applyArctic != null and page.applyArctic != ''">
-            and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
-        </if>
-        <trim suffixOverrides=",">
-            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
-                and (${page.advanceSearchStr})
-            </if>
-        </trim>
+
    </sql>


    <!--    分页查询-->
    <select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
            parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
-        select
-            DISTINCT a.id,
-            a.stand_type,
-            a.country,
-            a.stand_sort,
-            a.stand_number,
-            a.stand_year,
-            a.stand_name,
-            a.stand_en_name,
-            a.stand_state,
-            a.stand_nature,
-            a.issue_time,
-            a.put_time,
-            a.text_status,
-            a.creation_user,
-            a.valid_flag,
-            a.creation_time,
-            a.modify_time,
-            a.STAND_SYSTEM,
-            a.IS_RELATE_ACCESS,
-            SAR_STAND_ATTR_INFO.CHJL AS CHJL,
-            dicstandSort.DIC_TYPE_NAME AS standSortShow,
-            dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
-        (
-        CASE
-        WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01'
-        ELSE SAR_STAND_ATTR_INFO.SSRQ
-        END
-        ) AS SSRQ,
-        (
-        CASE
-        WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01'
-        ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ
-        END
-        ) AS ZCCSSRQ,
-        (
-        CASE
-        WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01'
-        ELSE SAR_STAND_ATTR_INFO.XCXSSRQ
-        END
-        ) AS XCXSSRQ
-         from
-        (select tmp_tb.*  from
-        (
        SELECT
        <include refid="Base_Column_List_DIS"/>
        from SAR_STANDARDS_INFO
@@ -1016,14 +995,8 @@
        <if test="mark == 999 ">
            and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
        </if>
-        ) tmp_tb
        <include refid="standSort_in"/>
        limit ${page.pager.startIndex-1},${page.pageSize}
-        ) a
-        <include refid="SarStandardsInfo_out_left"/>
-        order by
-        <include refid="standSort_out_2"/>
-        ${page.orderByA} ${page.order1},a.id
    </select>
    <!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
    <!--if(isnull(SAR_STANDARDS_INFO.issue_time),0,1) desc  ,-->
@@ -1160,6 +1133,9 @@
            GROUP BY <include refid="Group_Column_List_Show"/>
        ) a
        order by
+        <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
+            ${orderByA} ${order1},
+        </if>
        <include refid="standSort_out"/>
        a.issue_time is null
        ,a.issue_time desc,a.id