From 088ceb9faf6f1d0d9f57bb9cd65f542337d40b7f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index 11d1608..8c1802e 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -5,10 +5,10 @@
select id,
name,
specifications,
- code,
- check_state,
+ quality_traceability,
user_name,
DATE_FORMAT(create_time, '%Y-%m-%d') '鍏ュ簱鏃ユ湡',
+ check_result,
note
from mom_ocean.repertory
<where>
@@ -22,19 +22,10 @@
<if test="time!=null and time!=''">
and create_time=#{time}
</if>
- <if test="type!=null and type!=''">
+ <if test="type!=null ">
and type=#{type}
- </if>
- <if test="checkState!=null and checkState!=''">
- and check_state=#{checkState}
</if>
order by id desc
</where>
- </select>
- <!--鏌ヨ搴撳瓨涓変釜瀛楁缁欐坊鍔犻攢鍞崟-->
- <select id="getSale" resultType="java.util.Map">
- select id, name, specifications, unit
- from mom_ocean.repertory
- where state = 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3