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/CommunityServiceDaoImplMapper.xml | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 3a7c4d1..3c112fb
--- a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
@@ -7,15 +7,19 @@
<!-- 淇濆瓨灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessCommunityInfo" parameterType="Map">
insert into business_community(community_id,b_id,name,address,city_code,
- nearby_landmarks,map_x,map_y,month,state,operate,community_area)
+ nearby_landmarks,map_x,map_y,month,state,operate,community_area,tel)
values(#{communityId},#{bId},#{name},#{address},#{cityCode},
- #{nearbyLandmarks},#{mapX},#{mapY},#{month},#{state},#{operate},#{communityArea})
+ #{nearbyLandmarks},#{mapX},#{mapY},#{month},#{state},#{operate},#{communityArea},#{tel})
</insert>
+
+
+
<!-- 淇濆瓨灏忓尯灞炴�т俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessCommunityAttr" parameterType="Map">
insert into business_community_attr(b_id,attr_id,community_id,spec_cd,value,month,operate)
values(#{bId},#{attrId},#{communityId},#{specCd},#{value},#{month},#{operate})
</insert>
+
<!-- 淇濆瓨灏忓尯鐓х墖淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessCommunityPhoto" parameterType="Map">
insert into
@@ -23,11 +27,10 @@
values(#{communityPhotoId},#{bId},#{communityId},#{communityPhotoTypeCd},#{photo},#{month},#{operate})
</insert>
-
<!-- 鏌ヨ灏忓尯淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessCommunityInfo" parameterType="Map" resultType="Map">
select s.community_id,s.b_id,s.name,s.address,s.city_code,s.nearby_landmarks,
- s.map_x,s.map_y,s.operate,s.state,s.community_area communityArea,s.community_area
+ s.map_x,s.map_y,s.operate,s.state,s.community_area communityArea,s.community_area,s.tel
from business_community s where 1 = 1
<if test="operate != null and operate != ''">
and s.operate = #{operate}
@@ -39,7 +42,6 @@
and s.community_id = #{communityId}
</if>
</select>
-
<!-- 鏌ヨ灏忓尯灞炴�т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessCommunityAttrs" parameterType="Map" resultType="Map">
@@ -74,12 +76,11 @@
</if>
</select>
-
<!-- 淇濆瓨灏忓尯淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveCommunityInfoInstance" parameterType="Map">
insert into
- s_community(community_id,b_id,name,address,city_code,nearby_landmarks,map_x,map_y,status_cd,state,community_area)
- values(#{community_id},#{b_id},#{name},#{address},#{city_code},#{nearby_landmarks},#{map_x},#{map_y},'0',#{state},#{communityArea})
+ s_community(community_id,b_id,name,address,city_code,nearby_landmarks,map_x,map_y,status_cd,state,community_area,tel)
+ values(#{community_id},#{b_id},#{name},#{address},#{city_code},#{nearby_landmarks},#{map_x},#{map_y},'0',#{state},#{communityArea},#{tel})
</insert>
<!-- 淇濆瓨灏忓尯灞炴�т俊鎭埌 instance add by wuxw 2018-07-03 -->
@@ -104,7 +105,6 @@
</if>
</insert>
-
<!-- 鏌ヨ灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
<select id="getCommunityInfo" parameterType="Map" resultType="Map">
select s.community_id,s.b_id,s.name,s.address,s.city_code,s.nearby_landmarks,s.map_x,s.map_y,s.status_cd,s.state
@@ -113,7 +113,6 @@
<if test="statusCd != null and statusCd != ''">
and s.status_cd = #{statusCd}
</if>
-
<if test="bId != null and bId !=''">
and s.b_id = #{bId}
</if>
@@ -144,13 +143,18 @@
<if test="communityId != null and communityId !=''">
and sa.community_id = #{communityId}
</if>
+ <if test="specCd != null and specCd !=''">
+ and sa.spec_cd = #{specCd}
+ </if>
+ <if test="value != null and value !=''">
+ and sa.value = #{value}
+ </if>
<if test="communityIds != null ">
and sa.community_id in
<foreach collection="communityIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
-
<if test="attrId != null and attrId != ''">
and sa.attr_id = #{attrId}
</if>
@@ -172,14 +176,12 @@
</if>
</select>
-
<!-- 淇敼灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateCommunityInfoInstance" parameterType="Map">
update s_community s set s.status_cd = #{statusCd}
<if test="newBId != null and newBId != ''">
,s.b_id = #{newBId}
</if>
-
<if test="name != null and name != ''">
,s.name = #{name}
</if>
@@ -201,10 +203,12 @@
<if test="state != null and state != ''">
,s.state = #{state}
</if>
+ <if test="tel != null and tel != ''">
+ ,s.tel = #{tel}
+ </if>
<if test="communityArea != null and communityArea != ''">
,s.community_area = #{communityArea}
</if>
-
where 1=1
<if test="bId != null and bId !=''">
and s.b_id = #{bId}
@@ -462,7 +466,7 @@
<!-- 鏌ヨ灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
<select id="getCommunityInfoNew" parameterType="Map" resultType="Map">
select t.address,t.nearby_landmarks,t.nearby_landmarks nearbyLandmarks,
- t.city_code,t.city_code cityCode,t.name,t.status_cd,t.status_cd statusCd,
+ t.city_code,t.city_code cityCode,t.name,t.status_cd,t.status_cd statusCd,t.tel,
t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.map_y,t.map_y mapY,
t.map_x,t.map_x mapX,t.state,(CASE
WHEN t.state='1000'
@@ -478,7 +482,7 @@
<if test="memberId !=null and memberId !=''">
,s_community_member cm
</if>
- where 1 =1
+ where t.status_cd = '0'
and t.city_code = ca.area_code
and ca.status_cd = '0'
<if test="address !=null and address != ''">
@@ -532,6 +536,7 @@
</foreach>
</if>
group by t.community_id
+ order by t.create_time ASC
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -612,6 +617,7 @@
sc.`city_code` cityCode,
sc.`map_x` mapX,
sc.`map_y` mapY,
+ sc.tel,
scm.`community_member_id` communityMemberId,
scm.`member_id` memberId,
scm.`member_type_cd` memberTypeCd,
@@ -631,14 +637,14 @@
AND sc.`status_cd` = '0'
and sc.city_code = ca.area_code
and ca.parent_area_code = ca1.area_code
- AND scm.`member_id` = #memberId#
- AND scm.`member_type_cd` = #memberTypeCd#
+ AND scm.`member_id` = #{memberId}
+ AND scm.`member_type_cd` = #{memberTypeCd}
AND scm.`status_cd` = '0'
<if test="auditStatusCd ==null or auditStatusCd ==''">
and scm.audit_status_cd in ('1000', '1100','1200')
</if>
<if test="auditStatusCd !=null and auditStatusCd !=''">
- and scm.audit_status_cd = #auditStatusCd#
+ and scm.audit_status_cd = #{auditStatusCd}
</if>
group by sc.community_id
</select>
--
Gitblit v1.8.0