From f8913a0b4dd441c74c3dd82306a65708a4b1597e Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期五, 24 七月 2026 15:25:46 +0800
Subject: [PATCH] 修改多个模块页面展示逻辑
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 2 +-
src/main/resources/mapper/production/ProductOrderMapper.xml | 1 +
src/main/resources/mapper/device/DeviceRepairMapper.xml | 1 +
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 2 +-
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 1 +
src/main/resources/mapper/quality/QualityInspectMapper.xml | 2 +-
6 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 33b29a9..ca02119 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -38,5 +38,6 @@
<if test="req.approveType != null ">
and approve_type = #{req.approveType}
</if>
+ order by approve_time desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index aeb87a8..8578e7c 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -50,6 +50,7 @@
and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
</if>
</where>
+ order by dr.repair_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index cc6c3df..dfbdcd1 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -126,6 +126,7 @@
</if>
</where>
GROUP BY po.id
+ order by po.create_time desc
</select>
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index ecf0143..fcbf818 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -49,7 +49,7 @@
and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
</if>
</where>
- order by pwo.id desc
+ ORDER BY MAX(pwo.id) OVER (PARTITION BY po.nps_no) DESC, ppri.drag_sort ASC
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 8d2a066..322b2df 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -94,7 +94,7 @@
and ppm.status = #{c.status}
</if>
</where>
- order by ppm.id
+ order by ppm.create_time desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 8d000de..2aeed4f 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -96,7 +96,7 @@
<if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
AND qi.check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
</if>
- ORDER BY qi.check_time DESC
+ ORDER BY IF(qi.check_time IS NULL, 1, 0) ASC, qi.check_time DESC, qi.create_time DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
--
Gitblit v1.9.3