Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51

 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>