From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index b556cba..8c1802e 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -5,16 +5,16 @@
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>
and state=1
<if test="name!=null and name!=''">
- and name LIKE CONCAT('%',#{name},'%')
+ and name LIKE CONCAT('%',#{name},'%')
</if>
<if test="specifications!=null and specifications!=''">
and specifications LIKE CONCAT('%',#{specifications},'%')
@@ -22,12 +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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3