From 3594a911312b92561b08c478ef0319cf1ae2b0d8 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 7a3d9b8..b6471a3 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -35,7 +35,7 @@
order by ru.id desc
</select>
- <!--鍘熸潗鏂欎笉鍚堟牸-->
+ <!--鍘熸潗鏂欎笉鍚堟牸鍝�-->
<select id="selectUnqualifiedRawMaterials" resultType="map">
SELECT i.id,
DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
@@ -113,6 +113,7 @@
</if>
)AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
WHERE i.`state` = 1
+ AND i.`deal_reasult` = 0
<if test="state != null">
AND i.`deal_state` = #{state}
</if>
--
Gitblit v1.9.3