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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 27d0b48..4a78d79 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.RawMaterialMapper">
-
<select id="selectRawMaterial" resultType="com.yuanchu.limslaboratory.pojo.RawMaterial">
SELECT *
FROM raw_material r
@@ -12,11 +11,28 @@
<if test="materialName != null and materialName != ''">
AND r.`material_name` LIKE CONCAT('%',#{materialName},'%')
</if>
- <if test="condition != null and condition != ''">
- AND r.`condition` = #{condition}
+ <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">
+ select id,
+ supplier_name supplier,
+ 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
+ </select>
</mapper>
--
Gitblit v1.9.3