From 0afd6c073589d5221774dab5cf4a9d21415ec0e8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 18:00:44 +0800
Subject: [PATCH] 修改bug

---
 inspection-server/src/main/resources/mapper/RawMaterialMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 7e17cfa..7ca8063 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -11,7 +11,7 @@
         <if test="materialName != null and materialName != ''">
             AND r.`material_name` LIKE CONCAT('%',#{materialName},'%')
         </if>
-        <if test="type != null and type != ''">
+        <if test="type != null">
             AND r.`type` = #{type}
         </if>
         <if test="createTime != null and createTime != ''">
@@ -26,11 +26,12 @@
                specifications_models                    specifications,
                unit,
                quantity                                 num,
+               surveyor,
+               type,
                DATE_FORMAT(inspection_date, '%Y-%m-%d') startTime,
                DATE_FORMAT(date_survey, '%Y-%m-%d')     endTime,
                DATE_FORMAT(create_time, '%Y-%m-%d')     formTime
         from lims_laboratory.raw_material
         where state = 1
-          and type = 0
     </select>
 </mapper>

--
Gitblit v1.9.3