任务

pcbms/src/main/resources/mapper/GoodsMapper.xml

@@ -78,6 +78,8 @@
     <resultMap id="BaseResultMapDetail" type="com.hssx.pcbms.entity.vo.GoodsVO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
+        <result column="temp" property="temp"/>
+        <result column="hum" property="hum"/>
         <result column="tag_id" property="tagId"/>
         <result column="model_number" property="modelNumber"/>
         <result column="unit" property="unit"/>
@@ -106,7 +108,8 @@
     </resultMap>
     <select id="getListBycondition" resultMap="BaseResultMapVO">
         select
-        id, name, tag_id, model_number, unit, address, factory, pic, service_life, next_indate
+        id, name, tag_id, model_number, unit, address,
+        factory, pic, service_life, next_indate
         from
         goods
         <where>
@@ -133,7 +136,7 @@
     <select id="getDetail" resultMap="BaseResultMapDetail">
         select
         g.id, g.name, g.tag_id, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
-        g.is_delete,gn.id nid,g.good_type,g.rack_id,
+        g.is_delete,gn.id nid,g.good_type,g.rack_id,rd.hum,rd.door_status,rd.temp,
         gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone
         from
         goods g
@@ -142,6 +145,8 @@
         on g.id = gn.goods_id
         left join user u
         on u.id = gn.user_id
+        left join rack_data rd
+        on g.id = rd.goods_id
         <where>
             g.id = #{id}
         </where>
@@ -149,9 +154,11 @@
 
     <select id="selectMyList" resultMap="BaseResultMapMyList">
         select
-        g.id, g.name, g.tag_id, g.model_number, g.unit,g.address, g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,g.suffix_code suffixcode,
-        g.is_delete,gn.id nid,g.indate,
-        gn.model_no, gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id, gn.user_id,u.name username,gn.is_maintain,u.phone
+        g.id, g.name, g.tag_id, g.model_number, g.unit,g.address,
+        g.factory, g.pic, g.service_life, g.next_indate,g.division_code divisioncode,
+        g.suffix_code suffixcode,g.is_delete,gn.id nid,g.indate,gn.model_no,
+        gn.division_code, gn.suffix_code, gn.state, gn.indate, gn.goods_id,
+        gn.user_id,u.name username,gn.is_maintain,u.phone
         from
         goods g
         left join