From d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:23:30 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段

---
 src/main/resources/mapper/production/ProductionOrderMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 8e64413..74e80a9 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -134,7 +134,7 @@
         <include refid="ProductionOrderVoColumns" />
         <include refid="ProductionOrderVoFrom" />
         <include refid="ProductionOrderWhere" />
-        order by po.id desc
+        order by po.status  , po.plan_complete_time desc
     </select>
 
     <select id="listProductionOrder" resultMap="ProductionOrderVoResultMap">
@@ -233,7 +233,9 @@
             </if>
         </where>
         order by po.id desc
-        limit #{offset}, #{size}
+        <if test="size != null and size &gt;= 0">
+            limit #{offset}, #{size}
+        </if>
     </select>
 
     <select id="countHomeOrderProgress" resultType="java.lang.Long">

--
Gitblit v1.9.3