From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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..3192bd6 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
@@ -12,6 +12,7 @@
<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>
</resultMap>
<resultMap id="SysWarehouseDto" type="com.nanometer.smartlab.entity.dto.SysWarehouseDto">
@@ -22,7 +23,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"/>
@@ -78,13 +79,13 @@
</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 into sys_warehouse(id, type, name, info_code, bar_code, location1, location2, valid_flag, create_time, update_time,department)
+ values (#{id}, #{type}, #{name}, #{infoCode}, #{barCode}, #{location1}, #{location2}, 1, now(), now(),#{department})
</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}
where id=#{id}
</update>
--
Gitblit v1.9.2