Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -7,18 +7,17 @@
			<!-- 保存小区信息 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>

			<!-- 保存小区信息 -->
			<insert id="saveCommunity" parameterType="Map">
			insert into s_community(community_id,b_id,name,address,city_code,
			nearby_landmarks,map_x,map_y,create_time,state,tel,community_area)
			values(#{communityId},#{bId},#{name},#{address},#{cityCode},
			#{nearbyLandmarks},#{mapX},#{mapY},#{createTime},#{state},#{tel},#{communityArea})
			<!-- 保存小区属性信息 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">
			@@ -36,7 +35,7 @@
			<!-- 查询小区信息（Business） 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}
			@@ -85,8 +84,8 @@
			<!-- 保存小区信息至 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 -->
			@@ -149,6 +148,12 @@
			<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=",">
			@@ -203,7 +208,9 @@
			<if test="state != null and state != ''">
			,s.state = #{state}
			</if>
			,s.tel = #{tel}
			<if test="tel != null and tel != ''">
			,s.tel = #{tel}
			</if>
			<if test="communityArea != null and communityArea != ''">
			,s.community_area = #{communityArea}
			</if>
			@@ -268,15 +275,15 @@
			<!--小区成员加入 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})
			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
			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 != ''">
			@@ -287,7 +294,7 @@
			<!-- 查询小区成员 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
			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}
			@@ -308,6 +315,7 @@
			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 '待审核'
			@@ -384,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 !=''">
			@@ -464,7 +478,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'
			@@ -475,7 +489,7 @@
			'审核拒绝'
			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
			@@ -493,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}
			@@ -534,9 +551,11 @@
			</foreach>
			</if>
			group by t.community_id
			order by t.create_time ASC
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			@@ -619,6 +638,8 @@
			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,