From bb7b2eaea4df4407e623f3438adbecb0f6188fd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 21 四月 2026 10:17:45 +0800
Subject: [PATCH] fix(mapper): 修复多个查询的排序和字段映射问题

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml      |    1 +
 src/main/resources/mapper/production/ProductBomMapper.xml            |    1 +
 src/main/resources/mapper/stock/StockInventoryMapper.xml             |    1 +
 src/main/resources/mapper/production/ProductionProductMainMapper.xml |    3 ++-
 src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml         |    5 +++--
 src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml  |    2 ++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index ec06cd3..e563335 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -35,6 +35,7 @@
         <if test="c.version != null">
             and version = #{c.version}
         </if>
+        order by id desc
     </select>
     <select id="getById" resultType="com.ruoyi.production.dto.ProductBomDto">
         select pb.*,
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index d39ce36..ecf0143 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -77,6 +77,7 @@
                 pm.unit,
                 p.product_name,
                 po.nps_no
+        order by pwo.id desc
     </select>
     <select id="selectWorkOrderStartStats" 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 a122e90..eff9edf 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -69,7 +69,7 @@
         pm.model as product_model_name,
         pm.unit,
         slpa.process,
-        ppo.quantity,
+        slpa.finished_num as quantity,
         slpa.work_hours,
         slpa.work_hours * slpa.finished_num AS wages
         FROM
@@ -95,6 +95,7 @@
                 and slpa.scheduling_date &lt; date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)
             </if>
         </where>
+                order by ppm.id desc
     </select>
     <select id="listMain" resultType="java.lang.Long">
         SELECT ppm.id FROM production_product_main ppm
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index cb7aaa0..3087381 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -26,9 +26,10 @@
         GROUP BY
         sl.sales_contract_no,
         sl.customer_name,
-        sl.contract_amount
+        sl.contract_amount,
+        pl.purchase_contract_number
         ORDER BY
-        sl.sales_contract_no
+        sl.sales_contract_no desc
     </select>
     <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
         select *
diff --git a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
index 7dbb388..bf4a030 100644
--- a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
+++ b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
@@ -39,6 +39,7 @@
             and personal_attendance_records.date &gt;= #{params.date}
             and personal_attendance_records.date &lt; DATE_ADD(DATE(#{params.date}), INTERVAL 1 DAY)
         </if>
+        order by personal_attendance_records.id desc
     </select>
 
     <!-- 鏌ヨ鎸囧畾鏃ユ湡娌℃湁鑰冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紙鍦ㄦ寚瀹氭椂闂翠箣鍓嶅叆鑱岀殑锛� -->
@@ -58,6 +59,7 @@
         WHERE par.staff_on_job_id = soj.id
         AND par.date = #{date}
         )
+        ORDER BY soj.id
     </select>
 
     <!-- 妫�鏌ユ寚瀹氬憳宸ュ湪鎸囧畾鏃ユ湡鏄惁宸插瓨鍦ㄨ�冨嫟璁板綍 -->
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index f136a84..521ddd2 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -72,6 +72,7 @@
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
         </if>
+        order by si.update_time desc
     </select>
 
     <select id="pageListCombinedStockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">

--
Gitblit v1.9.3