From e8a75a44bdc130e8b162351c3c94c01f3d8ada5e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 八月 2023 17:58:00 +0800
Subject: [PATCH] 入库+发货
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 630bf15..ab3d5c2 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -2,7 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
<select id="selectUnRawInspectsList" resultType="java.util.Map">
- select DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
+ select
+ DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
code,
name,
@@ -17,13 +18,13 @@
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">
+ <if test="dealState!=null and dealState!=''">
and deal_state=#{dealState}
</if>
- <if test="formTime!=null">
+ <if test="formTime!=null and formTime!=''">
and form_time=#{formTime}
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and ru.type=#{type}
</if>
and ru.state=1
@@ -48,13 +49,13 @@
mom_ocean.user u
where fi.id = ru.raw_inspect_id
and fi.user_id=u.id
- <if test="dealState!=null">
+ <if test="dealState!=null and dealState!=''">
and deal_state=#{dealState}
</if>
- <if test="formTime!=null">
+ <if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
</if>
- <if test="type!=null">
+ <if test="type!=null and type!=''">
and ru.type=#{type}
</if>
and ru.state=1
--
Gitblit v1.9.3