Parcourir la source

小区加入上级地区

java110 il y a 6 ans
Parent
commit
d08f957104

+ 2 - 0
Api/src/main/java/com/java110/api/listener/owner/ListAppUserBindingOwnersListener.java

@@ -140,6 +140,8 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
                 if(apiAuditAppUserBindingOwnerDataVo.getCommunityId().equals(tmpCommunityDto.getCommunityId())){
                     apiAuditAppUserBindingOwnerDataVo.setAreaCode(tmpCommunityDto.getAreaCode());
                     apiAuditAppUserBindingOwnerDataVo.setAreaName(tmpCommunityDto.getAreaName());
+                    apiAuditAppUserBindingOwnerDataVo.setParentAreaCode(tmpCommunityDto.getParentAreaCode());
+                    apiAuditAppUserBindingOwnerDataVo.setParentAreaName(tmpCommunityDto.getParentAreaName());
                 }
             }
         }

+ 1 - 1
FrontService/src/main/java/com/java110/front/controller/CallComponentController.java

@@ -39,7 +39,7 @@ public class CallComponentController extends BaseController {
     /**
      * 前台调用api方法
      * add by wuxw 2020-03-16
-     *
+     * /callComponent/activities.listActivitiess
      * @return
      */
 

+ 18 - 1
java110-bean/src/main/java/com/java110/dto/community/CommunityDto.java

@@ -30,7 +30,8 @@ public class CommunityDto extends PageDto implements Serializable {
     private String auditStatusCd;
     private String areaCode;
     private String areaName;
-
+    private String parentAreaCode;
+    private String parentAreaName;
 
 
     private Date createTime;
@@ -174,4 +175,20 @@ public class CommunityDto extends PageDto implements Serializable {
     public void setAreaName(String areaName) {
         this.areaName = areaName;
     }
+
+    public String getParentAreaCode() {
+        return parentAreaCode;
+    }
+
+    public void setParentAreaCode(String parentAreaCode) {
+        this.parentAreaCode = parentAreaCode;
+    }
+
+    public String getParentAreaName() {
+        return parentAreaName;
+    }
+
+    public void setParentAreaName(String parentAreaName) {
+        this.parentAreaName = parentAreaName;
+    }
 }

+ 18 - 0
java110-bean/src/main/java/com/java110/vo/api/auditAppUserBindingOwner/ApiAuditAppUserBindingOwnerDataVo.java

@@ -18,6 +18,8 @@ public class ApiAuditAppUserBindingOwnerDataVo implements Serializable {
 
     private String areaCode;
     private String areaName;
+    private String parentAreaCode;
+    private String parentAreaName;
 
     public String getAppUserId() {
         return appUserId;
@@ -114,4 +116,20 @@ public class ApiAuditAppUserBindingOwnerDataVo implements Serializable {
     public void setAreaName(String areaName) {
         this.areaName = areaName;
     }
+
+    public String getParentAreaCode() {
+        return parentAreaCode;
+    }
+
+    public void setParentAreaCode(String parentAreaCode) {
+        this.parentAreaCode = parentAreaCode;
+    }
+
+    public String getParentAreaName() {
+        return parentAreaName;
+    }
+
+    public void setParentAreaName(String parentAreaName) {
+        this.parentAreaName = parentAreaName;
+    }
 }

+ 2 - 1
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -445,7 +445,8 @@
         THEN '审核完成'
         ELSE
         '审核拒绝'
-        END) stateName,ca.area_code areaCode,ca.area_name areaName
+        END) stateName,ca.area_code areaCode,ca.area_name areaName,
+        ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName
         from s_community t,city_area ca
         <if test="memberId !=null and memberId !=''">
             ,s_community_member cm