From 6645925b3eacf991174b1fd84da157709167b7bc Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 28 二月 2022 10:36:09 +0800
Subject: [PATCH] 仓库库存新增温湿度最大小值
---
src/main/java/com/nanometer/smartlab/entity/SysWarehouse.java | 39 +++++++++++++++++++++++++++++++++++++++
src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml | 20 ++++++++++++++++++--
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
index 8595882..7cab815 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
@@ -13,6 +13,10 @@
<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">
@@ -79,13 +83,25 @@
</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,department)
- values (#{id}, #{type}, #{name}, #{infoCode}, #{barCode}, #{location1}, #{location2}, 1, now(), now(),#{department})
+ insert into sys_warehouse(id, type, name, info_code, bar_code, location1, location2, valid_flag, create_time, update_time,department,temperature_max,temperature_min,humidity_max,humidity_min)
+ values (#{id}, #{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(),department=#{department}
+ <if test="temperatureMax != null and temperatureMax != ''">
+ ,temperature_max = #{temperatureMax}
+ </if>
+ <if test="temperatureMin != null and temperatureMin != ''">
+ ,temperature_min = #{temperatureMin}
+ </if>
+ <if test="humidityMax != null and humidityMax != ''">
+ ,humidity_max = #{humidityMax}
+ </if>
+ <if test="humidityMin != null and humidityMin != ''">
+ ,humidity_min = #{humidityMin}
+ </if>
where id=#{id}
</update>
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysWarehouse.java b/src/main/java/com/nanometer/smartlab/entity/SysWarehouse.java
index 72e8730..ffe5b05 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysWarehouse.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysWarehouse.java
@@ -3,6 +3,7 @@
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.sql.Timestamp;
/**
@@ -23,6 +24,11 @@
private ValidFlag validFlag;
//新增负责部门
private String department;
+
+ private BigDecimal temperatureMax;
+ private BigDecimal temperatureMin;
+ private BigDecimal humidityMax;
+ private BigDecimal humidityMin;
public String getId() {
return id;
@@ -111,4 +117,37 @@
public void setDepartment(String department) {
this.department = department;
}
+
+
+ public BigDecimal getTemperatureMax() {
+ return temperatureMax;
+ }
+
+ public void setTemperatureMax(BigDecimal temperatureMax) {
+ this.temperatureMax = temperatureMax;
+ }
+
+ public BigDecimal getTemperatureMin() {
+ return temperatureMin;
+ }
+
+ public void setTemperatureMin(BigDecimal temperatureMin) {
+ this.temperatureMin = temperatureMin;
+ }
+
+ public BigDecimal getHumidityMax() {
+ return humidityMax;
+ }
+
+ public void setHumidityMax(BigDecimal humidityMax) {
+ this.humidityMax = humidityMax;
+ }
+
+ public BigDecimal getHumidityMin() {
+ return humidityMin;
+ }
+
+ public void setHumidityMin(BigDecimal humidityMin) {
+ this.humidityMin = humidityMin;
+ }
}
--
Gitblit v1.9.2