From 8abe275e36823f1065300af45e1f7a9a68f549a7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 16:14:40 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/RawMaterialMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 7e17cfa..4a78d79 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -11,11 +11,11 @@
<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 != ''">
- AND DATE_FORMAT(r.`create_time`,'%Y-%m-%d') = #{createTime}
+ AND DATE_FORMAT(r.`date_survey`,'%Y-%m-%d') = #{createTime}
</if>
</select>
<select id="selectRawmaAll" resultType="java.util.Map">
@@ -24,13 +24,15 @@
material_coding mcode,
material_name name,
specifications_models specifications,
+ specifications_id specificationsId,
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