From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
index 554dea7..ef55afc 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
@@ -12,6 +12,11 @@
<result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>
<result property="createTime" column="create_time"></result>
<result property="updateTime" column="update_time"></result>
+ <result property="department" column="department"></result>
+ <result property="temperatureMax" column="temperature_max"></result>
+ <result property="temperatureMin" column="temperature_min"></result>
+ <result property="humidityMax" column="humidity_max"></result>
+ <result property="humidityMin" column="humidity_min"></result>
</resultMap>
<resultMap id="SysWarehouseDto" type="com.nanometer.smartlab.entity.dto.SysWarehouseDto">
@@ -22,7 +27,7 @@
<result property="barCode" column="bar_code"/>
<result property="location1" column="location1"/>
<result property="location2" column="location2"/>
- <collection property="sysWarehouseContainerDto" ofType="com.nanometer.smartlab.entity.dto.SysWarehouseContainerDto" fetchType="lazy">
+ <collection property="sysWarehouseContainer" ofType="com.nanometer.smartlab.entity.dto.SysWarehouseContainerDto" fetchType="lazy">
<id property="id" column="wc_id"/>
<result property="type" column="wc_type"/>
<result property="name" column="wc_name"/>
@@ -50,7 +55,7 @@
</if>
</sql>
- <select id="getSysWarehouse" parameterType="java.lang.String" resultMap="SysWarehouse" >
+ <select id="getSysWarehouse" resultMap="SysWarehouse" >
select * from sys_warehouse
where id = #{id} and valid_flag = 1
</select>
@@ -70,21 +75,25 @@
where su.valid_flag = 1
<include refid="queryWhereSql"/>
</select>
-
+
<select id="getAllSysWarehouseList" resultMap="SysWarehouse">
select * from sys_warehouse
where valid_flag = 1
order by name asc
</select>
- <insert id="insertSysWarehouse" parameterType="com.nanometer.smartlab.entity.SysWarehouse">
- insert into sys_warehouse(id, type, name, info_code, bar_code, location1, location2, valid_flag, create_time, update_time)
- values (#{id}, #{type}, #{name}, #{infoCode}, #{barCode}, #{location1}, #{location2}, 1, now(), now())
+ <insert id="insertSysWarehouse" parameterType="com.nanometer.smartlab.entity.SysWarehouse" useGeneratedKeys = "true" keyProperty = "id">
+ insert into sys_warehouse( type, name, info_code, bar_code, location1, location2, valid_flag, create_time, update_time,department,temperature_max,temperature_min,humidity_max,humidity_min)
+ values ( #{type}, #{name}, #{infoCode}, #{barCode}, #{location1}, #{location2}, 1, now(), now(),#{department},#{temperatureMax},#{temperatureMin},#{humidityMax},#{humidityMin})
</insert>
<update id="updateSysWarehouse" parameterType="com.nanometer.smartlab.entity.SysWarehouse">
update sys_warehouse set type=#{type}, name=#{name}, info_code=#{infoCode}, bar_code=#{barCode}, location1=#{location1}, location2=#{location2},
- update_time=now()
+ update_time=now(),department=#{department}
+ ,temperature_max = #{temperatureMax}
+ ,temperature_min = #{temperatureMin}
+ ,humidity_max = #{humidityMax}
+ ,humidity_min = #{humidityMin}
where id=#{id}
</update>
@@ -96,12 +105,12 @@
</foreach>
</update>
- <select id="getSysWarehouseByBarCode" parameterType="java.lang.String" resultMap="SysWarehouse" >
+ <select id="getSysWarehouseByBarCode" resultMap="SysWarehouse" >
select * from sys_warehouse
where bar_code = #{barCode}
</select>
-
-
+
+
<select id="selectWarehouse" resultMap="SysWarehouseDto">
SELECT
sw.id,
@@ -127,4 +136,20 @@
where sw.valid_flag = 1
AND swc.valid_flag = 1
</select>
+ <select id="selectAllWarehouse" resultType="java.util.Map">
+ select
+ sw.id,
+ sw.type,
+ bm.meta_value typeName,
+ sw.name,
+ sw.info_code infoCode,
+ sw.bar_code barCode,
+ sw.location1,
+ sw.location2,
+ date_format(sw.create_time,'%Y-%m-%d %H:%i:%S') createTime,
+ sw.department
+ from sys_warehouse as sw
+ left join base_meta bm on bm.id = sw.type
+ where sw.valid_flag = 1
+ </select>
</mapper>
--
Gitblit v1.9.2