优化业主端逻辑

java110-bean/src/main/java/com/java110/dto/owner/OwnerAppUserDto.java

@@ -61,10 +61,14 @@ public class OwnerAppUserDto extends PageDto implements Serializable {
     private String headImgUrl;
     private String ownerTypeCd;
 
+    private String ownerTypeCdName;
+
     private String roomId;
 
     private String roomName;
 
+    private String appTypeName;
+
 
 
 
@@ -332,4 +336,20 @@ public class OwnerAppUserDto extends PageDto implements Serializable {
     public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
+
+    public String getAppTypeName() {
+        return appTypeName;
+    }
+
+    public void setAppTypeName(String appTypeName) {
+        this.appTypeName = appTypeName;
+    }
+
+    public String getOwnerTypeCdName() {
+        return ownerTypeCdName;
+    }
+
+    public void setOwnerTypeCdName(String ownerTypeCdName) {
+        this.ownerTypeCdName = ownerTypeCdName;
+    }
 }

java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml

@@ -131,12 +131,14 @@
         communityName,t.state,t.app_user_id,t.app_user_id appUserId,t.community_id,t.community_id
         communityId,t.app_type_cd,t.app_type_cd appTypeCd,t.b_id,t.b_id bId,t.member_id,t.member_id memberId,
         td1.name stateName,t.user_id,t.user_id userId,t.app_type,t.app_type appType,t.create_time createTime,
-        bo.owner_id ownerId,bo.owner_type_cd ownerTypeCd,t.room_id roomId,t.room_name roomName
+        bo.owner_id ownerId,t.owner_type_cd ownerTypeCd,t.room_id roomId,t.room_name roomName,td2.name ownerTypeCdName
         from owner_app_user t
         left join t_dict td1 on t.state = td1.status_cd and td1.table_name = 'owner_app_user' and td1.table_columns =
         'state'
         left join building_owner bo on t.member_id = bo.member_id and t.community_id = bo.community_id and bo.status_cd
         = '0'
+        left join t_dict td2 on t.owner_type_cd = td2.status_cd and td2.table_name = 'building_owner' and td2.table_columns =
+        'owner_type_cd'
         where 1 =1
         <if test="idCard !=null and idCard != ''">
             and t.id_card= #{idCard}

service-user/src/main/java/com/java110/user/cmd/owner/ListAuditAppUserBindingOwnersCmd.java

@@ -12,6 +12,8 @@ import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import com.java110.vo.api.auditAppUserBindingOwner.ApiAuditAppUserBindingOwnerDataVo;
 import com.java110.vo.api.auditAppUserBindingOwner.ApiAuditAppUserBindingOwnerVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,13 +47,13 @@ public class ListAuditAppUserBindingOwnersCmd extends Cmd {
         OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
         ownerAppUserDto.setUserId("");
         int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
+        int row = reqJson.getIntValue("row");
 
-        List<ApiAuditAppUserBindingOwnerDataVo> auditAppUserBindingOwners = null;
-        List<ApiAuditAppUserBindingOwnerDataVo> ownerDtos = new ArrayList<>();
+        List<OwnerAppUserDto> ownerAppUserDtos = null;
         if (count > 0) {
-            auditAppUserBindingOwners = BeanConvertUtil.covertBeanList(ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto), ApiAuditAppUserBindingOwnerDataVo.class);
+            ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
             List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
-            for (ApiAuditAppUserBindingOwnerDataVo owner : auditAppUserBindingOwners) {
+            for (OwnerAppUserDto owner : ownerAppUserDtos) {
                 //区分小程序和和公众号
                 if (owner.getAppType().equals("WECHAT")) {
                     owner.setAppTypeName("公众号");
@@ -60,31 +62,22 @@ public class ListAuditAppUserBindingOwnersCmd extends Cmd {
                 }
                 //对业主身份证号隐藏处理
                 String idCard = owner.getIdCard();
-                if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 16) {
+                if (mark.size() == 0 && !StringUtil.isEmpty(idCard) && idCard.length() > 16) {
                     idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
                     owner.setIdCard(idCard);
                 }
                 //对业主手机号隐藏处理
                 String link = owner.getLink();
-                if (mark.size() == 0 && link != null && !link.equals("") && link.length() == 11) {
+                if (mark.size() == 0 &&!StringUtil.isEmpty(link) && link.length() == 11) {
                     link = link.substring(0, 3) + "****" + link.substring(7);
                     owner.setLink(link);
                 }
-                ownerDtos.add(owner);
             }
         } else {
-            auditAppUserBindingOwners = new ArrayList<>();
-            ownerDtos.addAll(auditAppUserBindingOwners);
+            ownerAppUserDtos = new ArrayList<>();
         }
 
-        ApiAuditAppUserBindingOwnerVo apiAuditAppUserBindingOwnerVo = new ApiAuditAppUserBindingOwnerVo();
-
-        apiAuditAppUserBindingOwnerVo.setTotal(count);
-        apiAuditAppUserBindingOwnerVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
-        apiAuditAppUserBindingOwnerVo.setAuditAppUserBindingOwners(ownerDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiAuditAppUserBindingOwnerVo), HttpStatus.OK);
-
+        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) count / (double) row), count, ownerAppUserDtos);
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }