From ff181c705c98885282668990c84219d17e04be0b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 15:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 9a03b30..06f79e1 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -38,11 +38,9 @@
<if test="c.workOrderNo != null and c.workOrderNo != ''">
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>
</where>
- </select>
- <select id="selectProductWorkOrderDtoList" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
- select *
- from product_work_order pwo
- left join product_order po on po.id = pwo.product_order_id
</select>
</mapper>
--
Gitblit v1.9.3