优化查询绑定信息 没有地区ID和名称的问题

Api/src/main/java/com/java110/api/listener/owner/ListAppUserBindingOwnersListener.java

@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.community.ICommunityInnerServiceSMO;
 import com.java110.core.smo.owner.IOwnerAppUserInnerServiceSMO;
 import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.community.CommunityDto;
+import com.java110.dto.demo.DemoDto;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.user.UserDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
@@ -36,6 +39,9 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
     @Autowired
     private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
@@ -81,17 +87,17 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
 
         String openId = userDtos.get(0).getOpenId();
 
-        if(!reqJson.containsKey("page")){
-            reqJson.put("page",1);
+        if (!reqJson.containsKey("page")) {
+            reqJson.put("page", 1);
         }
-        if(!reqJson.containsKey("row")){
-            reqJson.put("row",10);
+        if (!reqJson.containsKey("row")) {
+            reqJson.put("row", 10);
         }
 
         OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
-        if(!StringUtil.isEmpty(openId)) {//这里微信小程序
+        if (!StringUtil.isEmpty(openId)) {//这里微信小程序
             ownerAppUserDto.setOpenId(openId);
-        }else{ //这种是业主注册的
+        } else { //这种是业主注册的
 
             ownerAppUserDto.setUserId(userId);
         }
@@ -102,6 +108,7 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
 
         if (count > 0) {
             auditAppUserBindingOwners = BeanConvertUtil.covertBeanList(ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto), ApiAuditAppUserBindingOwnerDataVo.class);
+            refreshCommunityArea(auditAppUserBindingOwners);
         } else {
             auditAppUserBindingOwners = new ArrayList<>();
         }
@@ -118,6 +125,43 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
 
     }
 
+    /**
+     * 刷入小区地区
+     *
+     * @param auditAppUserBindingOwners
+     */
+    private void refreshCommunityArea(List<ApiAuditAppUserBindingOwnerDataVo> auditAppUserBindingOwners) {
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityIds(getCommunityIds(auditAppUserBindingOwners));
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+
+        for (CommunityDto tmpCommunityDto : communityDtos) {
+            for (ApiAuditAppUserBindingOwnerDataVo apiAuditAppUserBindingOwnerDataVo : auditAppUserBindingOwners) {
+                if(apiAuditAppUserBindingOwnerDataVo.getCommunityId().equals(tmpCommunityDto.getCommunityId())){
+                    apiAuditAppUserBindingOwnerDataVo.setAreaCode(tmpCommunityDto.getAreaCode());
+                    apiAuditAppUserBindingOwnerDataVo.setAreaName(tmpCommunityDto.getAreaName());
+                }
+            }
+        }
+
+
+    }
+
+    /**
+     * 获取批量userId
+     *
+     * @param auditAppUserBindingOwners 业主绑定信息
+     * @return 批量userIds 信息
+     */
+    private String[] getCommunityIds(List<ApiAuditAppUserBindingOwnerDataVo> auditAppUserBindingOwners) {
+        List<String> communityIds = new ArrayList<String>();
+        for (ApiAuditAppUserBindingOwnerDataVo apiAuditAppUserBindingOwnerDataVo : auditAppUserBindingOwners) {
+            communityIds.add(apiAuditAppUserBindingOwnerDataVo.getCommunityId());
+        }
+
+        return communityIds.toArray(new String[communityIds.size()]);
+    }
+
     public IOwnerAppUserInnerServiceSMO getOwnerAppUserInnerServiceSMOImpl() {
         return ownerAppUserInnerServiceSMOImpl;
     }

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

@@ -28,6 +28,8 @@ public class CommunityDto extends PageDto implements Serializable {
     private String stateName;
     private String[] communityIds;
     private String auditStatusCd;
+    private String areaCode;
+    private String areaName;
 
 
 
@@ -156,4 +158,20 @@ public class CommunityDto extends PageDto implements Serializable {
     public void setNotInCommunityId(String[] notInCommunityId) {
         this.notInCommunityId = notInCommunityId;
     }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
 }

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

@@ -16,6 +16,9 @@ public class ApiAuditAppUserBindingOwnerDataVo implements Serializable {
     private String stateName;
     private String createTime;
 
+    private String areaCode;
+    private String areaName;
+
     public String getAppUserId() {
         return appUserId;
     }
@@ -95,4 +98,20 @@ public class ApiAuditAppUserBindingOwnerDataVo implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
 }

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

@@ -445,12 +445,14 @@
         THEN '审核完成'
         ELSE
         '审核拒绝'
-        END) stateName
-        from s_community t
+        END) stateName,ca.area_code areaCode,ca.area_name areaName
+        from s_community t,city_area ca
         <if test="memberId !=null and memberId !=''">
             ,s_community_member cm
         </if>
         where 1 =1
+        and t.city_code = ca.area_code
+        and ca.status_cd = '0'
         <if test="address !=null and address != ''">
             and t.address= #{address}
         </if>