java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
1880a499b0

+ 11 - 0
java110-bean/src/main/java/com/java110/dto/community/CommunityDto.java

@@ -33,6 +33,8 @@ public class CommunityDto extends PageDto implements Serializable {
     private String parentAreaCode;
     private String parentAreaName;
 
+    private String communityArea;
+
 
     private Date createTime;
 
@@ -191,4 +193,13 @@ public class CommunityDto extends PageDto implements Serializable {
     public void setParentAreaName(String parentAreaName) {
         this.parentAreaName = parentAreaName;
     }
+
+
+    public String getCommunityArea() {
+        return communityArea;
+    }
+
+    public void setCommunityArea(String communityArea) {
+        this.communityArea = communityArea;
+    }
 }

+ 10 - 0
java110-bean/src/main/java/com/java110/po/community/CommunityPo.java

@@ -21,6 +21,8 @@ public class CommunityPo implements Serializable {
     private String mapY;
     private String state;
 
+    private String communityArea;
+
     public String getCommunityId() {
         return communityId;
     }
@@ -84,4 +86,12 @@ public class CommunityPo implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getCommunityArea() {
+        return communityArea;
+    }
+
+    public void setCommunityArea(String communityArea) {
+        this.communityArea = communityArea;
+    }
 }

+ 14 - 6
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -6,8 +6,10 @@
     
     <!-- 保存小区信息 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)
-        values(#{communityId},#{bId},#{name},#{address},#{cityCode},#{nearbyLandmarks},#{mapX},#{mapY},#{month},#{state},#{operate})
+        insert into business_community(community_id,b_id,name,address,city_code,
+        nearby_landmarks,map_x,map_y,month,state,operate,community_area)
+        values(#{communityId},#{bId},#{name},#{address},#{cityCode},
+        #{nearbyLandmarks},#{mapX},#{mapY},#{month},#{state},#{operate},#{communityArea})
     </insert>
     <!-- 保存小区属性信息  add by wuxw 2018-07-03 -->
     <insert id="saveBusinessCommunityAttr" parameterType="Map">
@@ -23,7 +25,8 @@
 
     <!-- 查询小区信息(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
+        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
         from business_community s where 1 = 1
         <if test="operate != null and operate != ''">
             and s.operate = #{operate}
@@ -73,8 +76,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)
-        values(#{community_id},#{b_id},#{name},#{address},#{city_code},#{nearby_landmarks},#{map_x},#{map_y},'0',#{state})
+        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>
 
     <!-- 保存小区属性信息到 instance add by wuxw 2018-07-03 -->
@@ -183,6 +186,10 @@
         <if test="state != null and state != ''">
             ,s.state = #{state}
         </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}
@@ -446,7 +453,8 @@
         ELSE
         '审核拒绝'
         END) stateName,ca.area_code areaCode,ca.area_name areaName,
-        ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName
+        ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName,
+        t.community_area communityArea
         from s_community t,city_area ca
         <if test="memberId !=null and memberId !=''">
             ,s_community_member cm

+ 10 - 3
service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java

@@ -6,14 +6,21 @@ import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.community.ICommunityBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.dto.CommunityMemberDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.po.community.CommunityMemberPo;
 import com.java110.po.community.CommunityPo;
 import com.java110.po.fee.PayFeeConfigPo;
 import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.*;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.CommunityMemberTypeConstant;
+import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.StateConstant;
+import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -483,6 +490,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
 
         paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
         paramInJson.put("state", "1000");
+        paramInJson.put("communityArea", "0");
         CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
         super.insert(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
 
@@ -497,7 +505,6 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
      */
     public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
-
         CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
 
         super.update(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);