From 844ffa2181d698f3871a62553fe10dd4054b63fa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index f6ccf2a..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>
@@ -25,18 +25,7 @@
<if test="type!=null ">
and type=#{type}
</if>
- <if test="checkState!=null ">
- 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
- and check_state = 1
- and type = 0
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3