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 |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 6e7e06c..ecf0143 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -38,16 +38,18 @@
         LEFT JOIN product_process pp ON pp.id = ppri.process_id
         LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
         LEFT JOIN product p ON p.id = pm.product_id
-        where 1=1
+        <where>
             <if test="c.workOrderNo != null and c.workOrderNo != ''">
-               and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
+                and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
             </if>
             <if test="c.planStartTime != null and c.planEndTime != null">
                 and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
             </if>
-            <if test="c.productOrderId != null and c.productOrderId != ''">
-               and pwo.product_order_id = #{c.productOrderId}
+            <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
+                and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
             </if>
+        </where>
+        order by pwo.id desc
     </select>
     <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
         SELECT
@@ -75,5 +77,25 @@
                 pm.unit,
                 p.product_name,
                 po.nps_no
+        order by pwo.id desc
+    </select>
+    <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+        SELECT
+            id,
+            actual_start_time AS planStartTime,
+            plan_quantity
+        FROM
+            product_work_order
+        WHERE
+            actual_start_time &gt;= #{startDate}
+            AND actual_start_time &lt;= #{endDate}
+    </select>
+    <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
+        SELECT SUBSTRING(work_order_no, 3) as work_order_no
+        FROM product_work_order
+        WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
+        order by work_order_no  desc
+        limit 1
+        ;
     </select>
 </mapper>

--
Gitblit v1.9.3