pms 瑞恒日报列表 排序。

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRhDailyReportMapper.xml

@@ -153,10 +153,11 @@
     <select id="rhDailyReports" resultMap="BaseResultMap"
             parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportPageReqVO">
         SELECT
-            *
+            rdr.*
         FROM
             rq_iot_rh_daily_report rdr
         INNER JOIN system_dept d ON d.id = rdr.dept_id
+        LEFT JOIN system_dept pd ON pd.id = d.parent_id
         WHERE
             rdr.deleted = 0
         AND rdr.dept_id IS NOT NULL
@@ -189,9 +190,9 @@
             </if>
         </if>
         ORDER BY
-            rdr.create_time DESC,
-            REGEXP_REPLACE ( d.`name`, '[0-9]+', '' ) ASC,
-            CAST( REGEXP_REPLACE ( d.`name`, '[^0-9]+', '' ) AS UNSIGNED ) ASC;
+            DATE(rdr.create_time) DESC,
+            COALESCE(pd.sort, 999999) ASC,
+            d.sort ASC;
     </select>
 
     <!-- 瑞恒日报汇总统计 -->