From d9e5ab959b7ff2c578672938c205a7a82765ef9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index bbab250..11d1608 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -2,30 +2,39 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.RepertoryMapper">
<select id="selectAllRepertory" resultType="java.util.Map">
- select name,
+ select id,
+ name,
specifications,
code,
- requirements,
- order_code,
- seat,
+ check_state,
user_name,
DATE_FORMAT(create_time, '%Y-%m-%d') '鍏ュ簱鏃ユ湡',
note
from mom_ocean.repertory
<where>
and state=1
- <if test="name!=null">
- and name =#{name}
+ <if test="name!=null and name!=''">
+ and name LIKE CONCAT('%',#{name},'%')
</if>
- <if test="specifications!=null ">
- and specifications=#{specifications}
+ <if test="specifications!=null and specifications!=''">
+ and specifications LIKE CONCAT('%',#{specifications},'%')
</if>
- <if test="time!=null ">
+ <if test="time!=null and time!=''">
and create_time=#{time}
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
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