From bc672038e88a24d9f0f7127cd45c656a15c231a2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 09 八月 2023 09:10:49 +0800
Subject: [PATCH] MOM系统-8-9
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 4cd0d51..630bf15 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -3,7 +3,6 @@
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
<select id="selectUnRawInspectsList" resultType="java.util.Map">
select DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
- supplier,
reason,
code,
name,
@@ -17,23 +16,21 @@
deal_reasult,
DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
+ <where>
<if test="dealState!=null">
- where deal_state=#{dealState}
+ and deal_state=#{dealState}
</if>
<if test="formTime!=null">
and form_time=#{formTime}
- </if>
- <if test="supplier!=null">
- and supplier=#{supplier}
</if>
<if test="type!=null">
and ru.type=#{type}
</if>
and ru.state=1
+ </where>
</select>
<select id="selectInsList" resultType="java.util.Map">
select DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
- supplier,
reason,
material_code,
name,
@@ -56,9 +53,6 @@
</if>
<if test="formTime!=null">
and fi.create_time=#{formTime}
- </if>
- <if test="supplier!=null">
- and supplier=#{supplier}
</if>
<if test="type!=null">
and ru.type=#{type}
--
Gitblit v1.9.3