From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 74e77d6..e02d08b 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -2,7 +2,7 @@
<!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 ru.id
+ select ru.id,
DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
code,
@@ -24,15 +24,12 @@
<if test="formTime!=null and formTime!=''">
and form_time=#{formTime}
</if>
- <if test="type!=null and type!=''">
- and ru.type=#{type}
- </if>
and ru.state=1
</where>
order by ru.id desc
</select>
<select id="selectInsList" resultType="java.util.Map">
- select ru.id
+ select ru.id,
DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
material_code,
@@ -56,9 +53,6 @@
</if>
<if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
- </if>
- <if test="type!=null and type!=''">
- and ru.type=#{type}
</if>
and ru.state=1
order by ru.id desc
--
Gitblit v1.9.3