代码提交

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml

@@ -413,6 +413,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
         cd.id
         ORDER BY
+        -- 实现自定义状态排序：审核中(2) > 已驳回(1) > 已通过(0)
+        CASE cd.review_status
+        WHEN 2 THEN 1  -- 已驳回 -> 排序值为 0
+        WHEN 1 THEN 2  -- 已通过 -> 排序值为 2
+        WHEN 0 THEN 0  -- 待审核 -> 排序值为 1
+        ELSE 3         -- 其他状态排在最后
+        END ASC,
+        -- 按申请时间降序排序（后申请的在前）
         cd.create_time
         DESC
     </select>

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml

@@ -454,29 +454,29 @@
 
     <select id="getList" resultType="com.bonus.material.devchange.domain.CsDeviceInfo">
         SELECT
-            cd.id AS id,
-            cd.type AS type,
-            cd.lease_type AS leaseType,
-            cd.pro_code AS proCode,
-            cd.pro_name AS proName,
-            cd.pro_type AS proType,
-            cd.voltage_level AS voltageLevel,
-            cd.use_unit AS useUnit,
-            cd.pro_province AS proProvince,
-            cd.pro_city AS proCity,
-            cd.pro_county AS proCounty,
-            cd.use_time AS useTime,
-            cd.CODE AS CODE,
-            cd.review_status AS taskStatus,
-            cd.create_user AS createBy,
-            cd.create_time AS createTime,
-            SUM(IF( cdc.dev_type = '1', cdc.num, 0 )) AS devNum,
-            SUM(IF( cdc.dev_type = '2', cdc.num, 0 )) AS toolNum
+        cd.id AS id,
+        cd.type AS type,
+        cd.lease_type AS leaseType,
+        cd.pro_code AS proCode,
+        cd.pro_name AS proName,
+        cd.pro_type AS proType,
+        cd.voltage_level AS voltageLevel,
+        cd.use_unit AS useUnit,
+        cd.pro_province AS proProvince,
+        cd.pro_city AS proCity,
+        cd.pro_county AS proCounty,
+        cd.use_time AS useTime,
+        cd.CODE AS CODE,
+        cd.review_status AS taskStatus,
+        cd.create_user AS createBy,
+        cd.create_time AS createTime,
+        SUM(IF( cdc.dev_type = '1', cdc.num, 0 )) AS devNum,
+        SUM(IF( cdc.dev_type = '2', cdc.num, 0 )) AS toolNum
         FROM
-            cs_device_change cd
-            LEFT JOIN cs_device_change_details cdc ON cd.id = cdc.change_id
+        cs_device_change cd
+        LEFT JOIN cs_device_change_details cdc ON cd.id = cdc.change_id
         WHERE
-            cdc.del_flag = '0' and cd.type = '2'
+        cdc.del_flag = '0' and cd.type = '2'
         <if test="taskStatus != null and taskStatus != ''">
             and cd.review_status = #{taskStatus}
         </if>
@@ -490,10 +490,17 @@
             and cd.pro_code = #{proCode}
         </if>
         GROUP BY
-            cd.id
+        cd.id
         ORDER BY
-            cd.create_time
-        DESC
+        -- 实现自定义状态排序：审核中(2) > 已驳回(1) > 已通过(0)
+        CASE cd.review_status
+        WHEN 2 THEN 1  -- 已驳回 -> 排序值为 0
+        WHEN 1 THEN 2  -- 已通过 -> 排序值为 2
+        WHEN 0 THEN 0  -- 待审核 -> 排序值为 1
+        ELSE 3         -- 其他状态排在最后
+        END ASC,
+        -- 按申请时间降序排序（后申请的在前）
+        cd.create_time DESC
     </select>
 
     <select id="getTypeMaDevInfo" resultType="com.bonus.material.devchange.domain.CsDeviceDetails">

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/scrap/ScrapMapper.xml

@@ -93,7 +93,16 @@
             AND cdc.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
         </if>
         GROUP BY cdc.id
-        ORDER BY cdc.create_time DESC
+        ORDER BY
+        -- 实现自定义状态排序：审核中(2) > 已驳回(1) > 已通过(0)
+        CASE cdc.review_status
+        WHEN 2 THEN 2
+        WHEN 1 THEN 1
+        WHEN 0 THEN 0
+        ELSE 3
+        END ASC,
+        -- 按申请时间降序排序（后申请的在前）
+        cdc.create_time DESC
     </select>
 
     <select id="getScrapDetailsList" resultType="com.bonus.material.scrap.domain.ToBeScrap">