From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/RoomAttrServiceDaoImplMapper.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomAttrServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomAttrServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 9050943..2d8ad12
--- a/java110-db/src/main/resources/mapper/community/RoomAttrServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomAttrServiceDaoImplMapper.xml
@@ -14,6 +14,14 @@
     </insert>
 
 
+    <insert id="saveRoomAttr" parameterType="Map">
+        insert into building_room_attr(
+        attr_id,spec_cd,b_id,value,room_id
+        ) values (
+        #{attrId},#{specCd},'-1',#{value},#{roomId}
+        )
+    </insert>
+
     <!-- 鏌ヨ灏忓尯鎴垮眿灞炴�т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessRoomAttrInfo" parameterType="Map" resultType="Map">
         select t.attr_id,t.attr_id attrId,t.operate,t.spec_cd,t.spec_cd specCd,t.b_id,t.b_id
@@ -70,8 +78,15 @@
     <!-- 鏌ヨ灏忓尯鎴垮眿灞炴�т俊鎭� add by wuxw 2018-07-03 -->
     <select id="getRoomAttrInfo" parameterType="Map" resultType="Map">
         select t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id
-        bId,t.value,t.room_id,t.room_id roomId
-        from building_room_attr t
+        bId,t.value,t.room_id,
+        t.room_id roomId,
+        s.spec_name specName,
+        v.value_name valueName,
+        s.list_show listShow
+        FROM
+        building_room_attr t
+        left join attr_spec s on t.spec_cd = s.spec_cd and s.status_cd = '0' and s.table_name = 'building_room_attr'
+        left join attr_value v on t.`value` = v.`value` and t.spec_cd = v.spec_cd and v.status_cd = '0'
         where 1 =1
         <if test="attrId !=null and attrId != ''">
             and t.attr_id= #{attrId}

--
Gitblit v1.8.0