From cbf4b74927fe51c19c307d89b326ae999cb6a165 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 九月 2023 17:50:25 +0800
Subject: [PATCH] 修改 9.12
---
inventory-server/src/main/resources/mapper/SaleMapper.xml | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index ef865df..a67167e 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -17,7 +17,7 @@
<if test="name!=null and name!=''">
and name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="type!=null and type!=''">
+ <if test="type!=null ">
and type=#{type}
</if>
<if test="delTime!=null and delTime!=''">
@@ -28,31 +28,33 @@
<!--鏌ヨ璁㈠崟BOM鍒楄〃-->
<select id="selectAllOrder" resultType="java.util.Map">
- select s.id ,
- order_number,
- saleman,
- proname,
- sm.name,
- specifications,
- unit,
- number,
- DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
- bianzhi_state
- from mom_ocean.sale s ,mom_ocean.sale_material sm
+ select sm.id,
+ order_number,
+ saleman,
+ proname,
+ sm.name,
+ specifications,
+ unit,
+ number,
+ DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ sm.type
+ from mom_ocean.sale s ,mom_ocean.sale_material sm
where s.id=sm.sale_id
and s.state=1
+ and s.type=1
<if test="orderCode!=null and orderCode!=''">
and order_number like concat('%',#{orderCode},'%')
</if>
<if test="name!=null and name!=''">
and sm.name like concat('%',#{name},'%')
</if>
- <if test="state!=null and state!=''">
- and bianzhi_state=#{state}
+ <if test="type!=null ">
+ and sm.type=#{type}
</if>
<if test="time!=null and time!=''">
and s.create_time=#{time}
</if>
+ order by delTime
</select>
</mapper>
--
Gitblit v1.9.3