From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml | 143 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 108 insertions(+), 35 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 750e9ab..6b78daf
--- a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
@@ -3,30 +3,39 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="communityServiceDaoImpl">
-
+
<!-- 淇濆瓨灏忓尯淇℃伅 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="saveCommunityAttr" parameterType="Map">
+ insert into s_community_attr(b_id,attr_id,community_id,spec_cd,value,month,status_cd)
+ values(#{bId},#{attrId},#{communityId},#{specCd},#{value},#{month},#{statusCd})
+ </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 business_community_photo(community_photo_id,b_id,community_id,community_photo_type_cd,photo,month,operate)
+ insert into
+ business_community_photo(community_photo_id,b_id,community_id,community_photo_type_cd,photo,month,operate)
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}
@@ -38,7 +47,6 @@
and s.community_id = #{communityId}
</if>
</select>
-
<!-- 鏌ヨ灏忓尯灞炴�т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessCommunityAttrs" parameterType="Map" resultType="Map">
@@ -73,11 +81,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})
+ insert into
+ 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 -->
@@ -90,18 +98,17 @@
and sa.community_id = #{communityId}
</if>
</insert>
-
+
<!-- 淇濆瓨 灏忓尯鐓х墖淇℃伅 instance add by wuxw 2018-07-03 -->
<insert id="saveCommunityPhotoInstance" parameterType="Map">
insert into s_community_photo(community_photo_id,b_id,community_id,community_photo_type_cd,photo,status_cd)
select sp.community_photo_id,sp.b_id,sp.community_id,sp.community_photo_type_cd,sp.photo,'0'
from business_community_photo sp
- where sp.operate = 'ADD' and sp.b_id=#{bId}
+ where sp.operate = 'ADD' and sp.b_id=#{bId}
<if test="communityId != null and communityId != ''">
and sp.community_id = #{communityId}
</if>
</insert>
-
<!-- 鏌ヨ灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
<select id="getCommunityInfo" parameterType="Map" resultType="Map">
@@ -111,7 +118,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>
@@ -123,8 +129,14 @@
<!-- 鏌ヨ灏忓尯灞炴�т俊鎭� add by wuxw 2018-07-03 -->
<select id="getCommunityAttrs" parameterType="Map" resultType="Map">
select sa.b_id,sa.attr_id,sa.community_id,sa.spec_cd,sa.value,sa.status_cd,
- sa.b_id bId,sa.attr_id attrId,sa.community_id communityId,sa.spec_cd specCd,sa.value
+ sa.b_id bId,sa.attr_id attrId,sa.community_id communityId,sa.spec_cd specCd,
+ s.spec_name specName,
+ v.value_name valueName,
+ s.list_show listShow
from s_community_attr sa
+ left join attr_spec s on sa.spec_cd = s.spec_cd and s.status_cd = '0' and s.table_name =
+ 'building_community_attr'
+ left join attr_value v on sa.`value` = v.`value` and sa.spec_cd = v.spec_cd and v.status_cd = '0'
where
1=1
<if test="statusCd != null and statusCd != ''">
@@ -136,13 +148,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>
@@ -164,15 +181,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>
@@ -194,10 +208,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}
@@ -255,18 +271,19 @@
</if>
</update>
-
<!--灏忓尯鎴愬憳鍔犲叆 add by wuxw 2018-10-27 saveBusinessCommunityMember-->
<insert id="saveBusinessCommunityMember" parameterType="Map">
- insert into business_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,month,operate,audit_status_cd)
- values(#{communityMemberId},#{bId},#{communityId},#{memberId},#{memberTypeCd},#{month},#{operate},#{auditStatusCd})
+ insert into
+ business_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,month,operate,audit_status_cd,start_time,end_time)
+ values(#{communityMemberId},#{bId},#{communityId},#{memberId},#{memberTypeCd},#{month},#{operate},#{auditStatusCd},#{startTime},#{endTime})
</insert>
<!-- 灏忓尯鎴愬憳鍔犲叆 instance琛ㄤ腑 add by wuxw 2018-10-27 -->
<insert id="saveCommunityMemberInstance" parameterType="Map">
- insert into s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd,audit_status_cd)
- select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'0',ms.audit_status_cd
+ insert into
+ s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd,audit_status_cd,start_time,end_time)
+ select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'0',ms.audit_status_cd,ms.start_time,ms.end_time
from business_community_member ms where
ms.operate = 'ADD' and ms.b_id=#{bId}
<if test="communityId != null and communityId != ''">
@@ -276,7 +293,8 @@
<!-- 鏌ヨ灏忓尯鎴愬憳 add by wuxw 2018-10-27 getBusinessCommunityMember-->
<select id="getBusinessCommunityMember" parameterType="Map" resultType="Map">
- select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.operate,ms.audit_status_cd
+ select
+ ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.operate,ms.audit_status_cd,ms.start_time,ms.end_time
from business_community_member ms where 1 = 1
<if test="operate != null and operate != ''">
and ms.operate = #{operate}
@@ -292,9 +310,12 @@
<!-- 鏌ヨ灏忓尯鎴愬憳 add by wuxw 2018-07-03 -->
<select id="getCommunityMember" parameterType="Map" resultType="Map">
- select ms.community_member_id , ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd,
- ms.community_member_id communityMemberId ,ms.b_id bId,ms.community_id communityId,ms.member_id memberId,ms.member_type_cd memberTypeCd,ms.status_cd statusCd,
+ select ms.community_member_id ,
+ ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd,
+ ms.community_member_id communityMemberId ,ms.b_id bId,ms.community_id communityId,ms.member_id
+ memberId,ms.member_type_cd memberTypeCd,ms.status_cd statusCd,
ms.audit_status_cd auditStatusCd,
+ ms.start_time,ms.end_time,ms.start_time startTime,ms.end_time endTime,
(CASE
WHEN ms.audit_status_cd='1000'
THEN '寰呭鏍�'
@@ -371,6 +392,12 @@
</if>
<if test="auditStatusCd !=null and auditStatusCd !=''">
,ms.audit_status_cd = #{auditStatusCd}
+ </if>
+ <if test="startTime !=null ">
+ ,ms.start_time = #{startTime}
+ </if>
+ <if test="endTime !=null ">
+ ,ms.end_time = #{endTime}
</if>
where 1=1
<if test="bId != null and bId !=''">
@@ -450,8 +477,8 @@
<!-- 鏌ヨ灏忓尯淇℃伅 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,
+ 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.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'
@@ -462,12 +489,12 @@
'瀹℃牳鎷掔粷'
END) stateName,ca.area_code areaCode,ca.area_name areaName,
ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName,
- t.community_area communityArea
+ t.community_area communityArea,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.fee_price,t.fee_price feePrice
from s_community t,city_area ca
<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 != ''">
@@ -480,7 +507,10 @@
and t.city_code= #{cityCode}
</if>
<if test="name !=null and name != ''">
- and t.name like concat('%',#{name},'%')
+ and t.name = #{name}
+ </if>
+ <if test="nameLike !=null and nameLike != ''">
+ and t.name like concat('%',#{nameLike},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -521,6 +551,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>
@@ -528,10 +559,9 @@
</select>
-
<!-- 鏌ヨ灏忓尯鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryCommunitysCount" parameterType="Map" resultType="Map">
- select count(DISTINCT(t.community_id)) count
+ select count(DISTINCT(t.community_id)) count
from s_community t,city_area ca
<if test="memberId !=null and memberId !=''">
,s_community_member cm
@@ -592,4 +622,47 @@
</select>
+ <!-- 鏌ヨ鍟嗘埛灏忓尯 -->
+ <select id="getStoreCommunitys" parameterType="Map" resultType="Map">
+ SELECT
+ sc.`community_id` communityId,
+ sc.`name`,
+ sc.`address`,
+ sc.`nearby_landmarks` nearbyLandmarks,
+ 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,
+ scm.audit_status_cd auditStatusCd,
+ scm.`status_cd` statusCd,
+ scm.`start_time` startTime,
+ scm.`end_time` endTime,
+ ca.area_name areaName,
+ ca.parent_area_name cityName,
+ ca1.parent_area_name provName,
+ sc.community_area communityArea
+ FROM
+ s_community sc,
+ s_community_member scm,
+ city_area ca,
+ city_area ca1
+ WHERE
+ sc.`community_id` = scm.`community_id`
+ 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.`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}
+ </if>
+ group by sc.community_id
+ </select>
</mapper>
--
Gitblit v1.8.0