提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -878,6 +878,12 @@ public class TaUserServiceImpl implements ITaUserService {
         // 根据 审核id 查询 出审核的数据，里面有角色id
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(user.getUserVerifyId());
 
+        userVO.setPhaseId(userVerify.getPhaseId());
+        userVO.setBuildingId(userVerify.getBuildingId());
+        userVO.setUnitId(userVerify.getUnitId());
+        userVO.setLevelId(userVerify.getLevelId());
+        userVO.setRoomNoId(userVerify.getRoomNoId());
+
         // 房产状态
         userVO.setVerifyStatus(userVerify.getVerifyStatus());
 
@@ -913,6 +919,7 @@ public class TaUserServiceImpl implements ITaUserService {
             }
         }
 
+
         return userVO;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRoomNoMapper.java

@@ -1,12 +1,15 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.community.huiju.model.TpRoomNo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * <p>
  * 户号信息表 Mapper 接口
@@ -39,5 +42,23 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
             "and name = #{roomNoName}")
     TpRoomNo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
+    /**
+     * 查询数据，分页
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ResultType(TpRoomNo.class)
+    @Select("select * from tp_room_no where community_id = #{communityId} limit #{pageNum},#{pageSize}")
+    List<TpRoomNo> selectCommunityIdList(@Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 查询数据，分页
+     * @param communityId
+     * @return
+     */
+    @ResultType(Long.class)
+    @Select("select count(1) from tp_room_no where community_id = #{communityId}")
+    Long selectCommunityIdCount(@Param("communityId") Integer communityId);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -337,31 +337,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 billInvoice.setCommunityId(userElement.getCommunityId());
                 billInvoice.setBillId(bill.getId());
 
-                // 根据 小区，期，栋，单元，楼层，房号 -》 查询房号id
-                // 因为和房间关联
-
-                /**
-                 * 需要知道这个房产的业主
-                 */
-                TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressName(userElement.getCommunityId(), e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
-
-                TaUser ownerUser = null;
-                TpBuildingOwnerInfo buildingOwnerInfo = null;
-                if (null != userVerify) {
-                    // 业主个人信息
-                    ownerUser = taUserMapper.selectById(userVerify.getUserId());
-
-                    // 楼栋资料库
-                    buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(),
-                                                userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
-                                                userVerify.getLevelId(), userVerify.getRoomNoId(), ownerUser.getLoginName());
-                    if (null == buildingOwnerInfo) {
-                        throw new WisdomException("手机号为：" + ownerUser.getLoginName() + " 楼栋业主资料不存在！");
-                    }
-                    billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
-
-                }
-
                 /**
                  * 查询房号
                  */
@@ -369,9 +344,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (null == tpRoomNo) {
                     throw new WisdomException("房产：" + e.getPhase() + e.getBuilding() + e.getUnit() + e.getLevel() + e.getRoomNo() + " 不存在！请核对！");
                 }
-                if (null != ownerUser) {
-                    billInvoice.setTaUserId(ownerUser.getId());
-                }
                 billInvoice.setRoomNoId(tpRoomNo.getId());
                 billInvoice.setBillInvoiceExplain(e.getBillExplain());
                 billInvoice.setPayPrice(e.getPayPrice());
@@ -448,52 +420,49 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         int lastRowNum = sheetAt.getLastRowNum();
 
         // 从第7行开始读取
-        for (int i= 6; i<= lastRowNum; i++) {
+        for (int i= 6; i< lastRowNum; i++) {
+            int currentRow = i + 1;
             Row row = sheetAt.getRow(i);
             Cell cell = getCell(row.getCell(0));
             if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 期/区 不能为空");
+                throw new WisdomException("第" + currentRow + "行 期/区 不能为空");
             }
             String phase = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(1));
             if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 楼栋 不能为空");
+                throw new WisdomException("第" + currentRow + "行 楼栋 不能为空");
             }
             String building = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(2));
             if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 单元 不能为空");
+                throw new WisdomException("第" + currentRow + "行 单元 不能为空");
             }
             String unit = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(3));
             if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 楼层 不能为空");
+                throw new WisdomException("第" + currentRow + "行 楼层 不能为空");
             }
             String level = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(4));
             if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 房号 不能为空");
+                throw new WisdomException("第" + currentRow + "行 房号 不能为空");
             }
             String roomNo = cell.getStringCellValue().trim();
-            cell = getCell(row.getCell(5));
-            if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 业主姓名 不能为空");
-            }
-            String ownerName = cell.getStringCellValue().trim();
+
 
             // 收费说明可以为空
-            cell = getCell(row.getCell(6));
+            cell = getCell(row.getCell(5));
             String billExplain = null;
             if (null != cell) {
                 billExplain = cell.getStringCellValue().trim();
                 if (billExplain.length() > 100) {
-                    throw new WisdomException("第" + i+1 + "行 收费说明超出100字，请精简到100字以内");
+                    throw new WisdomException("第" + currentRow + "行 收费说明超出100字，请精简到100字以内");
                 }
             }
 
-            cell = getCell(row.getCell(7));
+            cell = getCell(row.getCell(6));
             if (null == cell) {
-                throw new WisdomException("第" + i+1 + "行 金额 不能为空");
+                throw new WisdomException("第" + currentRow + "行 金额 不能为空");
             }
             String money = cell.getStringCellValue().trim();
 
@@ -504,7 +473,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             temp.setLevel(level);
             temp.setUnit(unit);
             temp.setRoomNo(roomNo);
-            temp.setOwnerName(ownerName);
+            // temp.setOwnerName(ownerName);
             temp.setBillExplain(billExplain);
 
 
@@ -636,17 +605,13 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         // 创建列
         HSSFCell cell = null;
 
-        Integer pageNum = 1;
+        Integer pageNum = 0;
         Integer pageSize = 10;
-        Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
         // 分页查询
-        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
-        buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
-        buildingOwnerInfoQueryWrapper.groupBy("phase_id", "building_id", "unit_id", "level_id", "room_no_id");
-        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
-        List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
+
+        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(), pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = infoIPage.getPages();
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getCommunityId());
 
 
         // 行数 默认从 第 6 行开始
@@ -656,29 +621,29 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         if (records.size() > 0) {
             do {
-                TpBuildingOwnerInfo buildingOwnerInfo = records.get(index);
+                TpRoomNo tpRoomNo = records.get(index);
                 row = sheet.createRow(currentRow);
                 cell = row.createCell(0);
-                cell.setCellValue(buildingOwnerInfo.getPhaseName());
+                cell.setCellValue(tpRoomNo.getPhaseName());
                 cell = row.createCell(1);
-                cell.setCellValue(buildingOwnerInfo.getBuildingName());
+                cell.setCellValue(tpRoomNo.getBuildingName());
                 cell = row.createCell(2);
-                cell.setCellValue(buildingOwnerInfo.getUnitName());
+                cell.setCellValue(tpRoomNo.getUnitName());
                 cell = row.createCell(3);
-                cell.setCellValue(buildingOwnerInfo.getLevelName());
+                cell.setCellValue(tpRoomNo.getLevelName());
                 cell = row.createCell(4);
-                cell.setCellValue(buildingOwnerInfo.getRoomNoName());
-                cell = row.createCell(5);
-                cell.setCellValue(buildingOwnerInfo.getOwnerName() + "");
+                cell.setCellValue(tpRoomNo.getName());
                 currentRow ++;
                 index ++;
                 if (index == records.size()) {
                     index = 0;
-                    page = new Page(infoIPage.getCurrent() + 1,pageSize);
-                    infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
-                    records = infoIPage.getRecords();
+                    pageNum ++;
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(), pageNum * pageSize, pageSize);
+                }
+                if (records.isEmpty()) {
+                    break;
                 }
-            } while (infoIPage.getCurrent() <= pages);
+            } while (pageNum <= pages);
         }
 
         responseBean.addSuccess(workbook);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.community.huiju.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,7 +10,6 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
-import com.community.commom.utils.BeanTools;
 
 import com.community.huiju.common.base.messagePush;
 import com.community.huiju.common.code.ICode;
@@ -22,9 +20,7 @@ import com.community.huiju.model.*;
 
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
-import com.community.huiju.service.ITaUserService;
 import com.google.common.collect.Maps;
-import org.apache.commons.collections.CollectionUtils;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -43,8 +39,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -231,14 +226,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             return responseBean;
         }
 
-        // 插入楼栋资料库
-        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
-                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
-                tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel());
+        TaUser appUser = getByLoginName(tpBuildingOwnerInfo.getOwnerTel());
 
         // 开始匹配 APP 端用户表
-        // 查询 APP 端
-        TaUser appUser = getByLoginName(tpBuildingOwnerInfo.getOwnerTel());
         if (null == appUser) {
             // 如果 APP端 没有这个用户，则自动注册一个
             TaUser taUser = new TaUser();
@@ -255,6 +245,16 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             taUserMapper.updateById(taUser);
             appUser = taUser;
         }
+
+        // 设置 用户性别 和 用户姓名
+        tpBuildingOwnerInfo.setGender(appUser.getGender());
+        tpBuildingOwnerInfo.setOwnerName(appUser.getUserName());
+
+        // 插入楼栋资料库
+        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
+                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
+                tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel());
+
         // 更新 APP 端用户姓名
         appUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
         appUser.setCreateDate(LocalDateTime.now());
@@ -311,7 +311,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
             Message message = new Message();
-            message.setCommunityId(userVerify.getCommunityId());
+            message.setCommunityId(taUserVerify.getCommunityId());
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
@@ -452,12 +452,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
         
         //批量插入
-        tpBuildingOwnerInfoMapper.batchInsert(list);
+        // tpBuildingOwnerInfoMapper.batchInsert(list);
         
         //构造数据
         for (TpBuildingOwnerInfo tpBuildingOwnerInfo : list){
             //根据手机号查询这个手机号是否注册
-            TaUser taUser = taUserMapper.selectByTel(tpBuildingOwnerInfo.getOwnerTel());
+            QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("login_name", tpBuildingOwnerInfo.getOwnerTel());
+            TaUser taUser = taUserMapper.selectOne(queryWrapper);
             if (null == taUser){
                 //插入新用户并审核通过
                 addNewUser(tpBuildingOwnerInfo,userElement);
@@ -471,20 +473,31 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
     
     private void checkUserVerify(TaUser taUser, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+
         //有用户的情况下查看是否有申请的房产
         QueryWrapper<TaUserVerify> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("community_id",userElement.getCommunityId());
         queryWrapper.eq("user_id",taUser.getId());
         List<TaUserVerify> verifyList = taUserVerifyMapper.selectList(queryWrapper);
+        AtomicInteger rows = new AtomicInteger();
         if (verifyList.size() > 0){
             verifyList.stream().forEach(e -> {
-                if (e.getRoomNoId().equals(tpBuildingOwnerInfo.getId()) && e.getVerifyStatus().equals("0")){
+                if (e.getVerifyStatus().equals("0") &&
+                    e.getPhaseId().intValue() == tpBuildingOwnerInfo.getPhaseId().intValue()
+                        && e.getBuildingId().intValue() == tpBuildingOwnerInfo.getBuildingId().intValue()
+                        && e.getUnitId().intValue() == tpBuildingOwnerInfo.getUnitId().intValue()
+                        && e.getLevelId().intValue() == tpBuildingOwnerInfo.getLevelId().intValue()
+                        && e.getRoomNoId().intValue() == tpBuildingOwnerInfo.getRoomNoId().intValue() ){
+
                     e.setVerifyStatus("1");
                     e.setVerifyName(userElement.getUserName());
-                    taUserVerifyMapper.updateById(e);
+                    rows.set(taUserVerifyMapper.updateById(e));
                 }
             });
-            return;
+            if (rows.get() > 0) {
+                return;
+            }
+
         }
         //插入一条房产数据
         saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
@@ -520,6 +533,16 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }else if (tpBuildingOwnerInfo.getRoleName().equals("租客")){
             taUserVerify.setRoleId(2);
         }
+
+        // TODO 是否只允许一个房产中只有一个角色？还是说多个角色？排除业主角色
+        TaUserVerify boolUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userId, userElement.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(),
+                tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
+                tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), taUserVerify.getRoleId());
+        // 表示这个用户在这个房产中已经有了这个角色, 就不进行插入
+        if (null != boolUserVerify) {
+            return;
+        }
+
         taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
         taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
         taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());
@@ -528,12 +551,27 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         taUserVerify.setUnitName(tpBuildingOwnerInfo.getUnitName());
         taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
         taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
-        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getId());
+        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getRoomNoId());
         taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getRoomNoName());
         taUserVerify.setVerifyStatus("1");
         taUserVerify.setCreateDate(LocalDateTime.now());
         taUserVerify.setVerifyName(userElement.getUserName());
         taUserVerifyMapper.insert(taUserVerify);
+
+        TaUser taUser = taUserMapper.selectById(userId);
+
+
+        // 通过后，需要往楼栋资料库写入数据
+        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+        tpBuildingOwnerInfo.setIdCard(taUser.getIdCard());
+        tpBuildingOwnerInfo.setGender(taUser.getGender());
+        tpBuildingOwnerInfo.setPairStatus("1");
+        tpBuildingOwnerInfo.setVerifyStatus("1");
+        tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
+        tpBuildingOwnerInfo.setCreateUser(userElement.getId());
+        tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
+
+        tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
     }
     
     @Override
@@ -634,8 +672,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     return responseBean;
                 }
                 //房产ID不为空的情况下检查房产是否存在
-                TpBuildingOwnerInfo checkOwnerInfo =tpBuildingOwnerInfoMapper.selectById(roomNoId);
-                if (null == checkOwnerInfo){
+                TpRoomNo tpRoomNo = tpRoomNoMapper.selectById(roomNoId);
+                if (null == tpRoomNo){
                     responseBean.addError("第" + currentRow + "行" + "房产ID不存在!");
                     return responseBean;
                 }
@@ -657,18 +695,30 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     return responseBean;
                 }
     
-                if (temBuildingList.contains(roomNoId)){
-                    logger.info("存在重复房源:{}",roomNoId);
-                    responseBean.addError("第"+ currentRow +"行存在重复房源");
-                    return responseBean;
-                }
+//                if (temBuildingList.contains(roomNoId)){
+//                    logger.info("存在重复房源:{}",roomNoId);
+//                    responseBean.addError("第"+ currentRow +"行存在重复房源");
+//                    return responseBean;
+//                }
                 
                 //把数据塞入temList校验是否有重复的数据
                 temBuildingList.add(roomNoId);
                 //构建数据
+                TpBuildingOwnerInfo checkOwnerInfo = new TpBuildingOwnerInfo();
+                checkOwnerInfo.setId(null);
                 checkOwnerInfo.setRoleName(ownerRole);
                 checkOwnerInfo.setOwnerName(ownerName);
                 checkOwnerInfo.setOwnerTel(ownerTel);
+                checkOwnerInfo.setPhaseId(tpRoomNo.getPhaseId());
+                checkOwnerInfo.setPhaseName(tpRoomNo.getPhaseName());
+                checkOwnerInfo.setBuildingId(tpRoomNo.getBuildingId());
+                checkOwnerInfo.setBuildingName(tpRoomNo.getBuildingName());
+                checkOwnerInfo.setUnitId(tpRoomNo.getUnitId());
+                checkOwnerInfo.setUnitName(tpRoomNo.getUnitName());
+                checkOwnerInfo.setLevelId(tpRoomNo.getLevelId());
+                checkOwnerInfo.setLevelName(tpRoomNo.getLevelName());
+                checkOwnerInfo.setRoomNoId(tpRoomNo.getId());
+                checkOwnerInfo.setRoomNoName(tpRoomNo.getName());
                 list.add(checkOwnerInfo);
             }
         }
@@ -907,16 +957,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 创建列
         XSSFCell cell = null;
 
-        Integer pageNum = 1;
+        Integer pageNum = 0;
         Integer pageSize = 10;
-        Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
+
         // 分页查询
-        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
-        buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
-        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
-        List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
+        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(),pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = infoIPage.getPages();
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getCommunityId());
 
 
         // 行数 默认从 第 3 行开始
@@ -934,13 +981,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         if (records.size() > 0) {
             do {
-                TpBuildingOwnerInfo buildingOwnerInfo = records.get(index);
+                TpRoomNo tpRoomNo = records.get(index);
                 row = sheet.createRow(currentRow);
-                String address = buildingOwnerInfo.getPhaseName() +
-                        buildingOwnerInfo.getBuildingName() +
-                        buildingOwnerInfo.getUnitName() +
-                        buildingOwnerInfo.getLevelName() +
-                        buildingOwnerInfo.getRoomNoName();
+                String address = tpRoomNo.getPhaseName() +
+                        tpRoomNo.getBuildingName() +
+                        tpRoomNo.getUnitName() +
+                        tpRoomNo.getLevelName() +
+                        tpRoomNo.getName();
 
                 cell = row.createCell(0);
                 cell.setCellType(Cell.CELL_TYPE_STRING);
@@ -948,7 +995,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 cell.setCellStyle(cellStyle);
                 cell = row.createCell(1);
                 cell.setCellType(Cell.CELL_TYPE_STRING);
-                cell.setCellValue(buildingOwnerInfo.getId());
+                cell.setCellValue(tpRoomNo.getId());
                 cell.setCellStyle(cellStyle);
                 cell = row.createCell(2);
                 cell.setCellType(Cell.CELL_TYPE_STRING);
@@ -964,11 +1011,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 index ++;
                 if (index == records.size()) {
                     index = 0;
-                    page = new Page(infoIPage.getCurrent() + 1,pageSize);
-                    infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
-                    records = infoIPage.getRecords();
+                    pageNum ++;
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getCommunityId(),pageNum * pageSize, pageSize);
+                }
+                if (records.isEmpty()) {
+                    break;
                 }
-            } while (infoIPage.getCurrent() <= pages);
+            } while (pageNum <= pages);
         }
 
         responseBean.addSuccess(workbook);

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -61,6 +61,10 @@
     <select id="selectListByParams" resultType="com.community.huiju.model.TpBuildingOwnerInfo">
         SELECT
             t.id,
+            t.phase_name,
+            t.building_name,
+            t.unit_name,
+            t.level_name,
             t.room_no_name,
             u.id as userVerifyId,
             t.community_id as communityId,

VUECODE/smart-property-manage/src/views/bill/add/index.vue

@@ -49,9 +49,9 @@
           width="180">
           <template slot-scope="scope">{{ showAddress(scope.row) }}</template>
         </el-table-column>
-        <el-table-column
-          prop="ownerName"
-          label="户主姓名"/>
+        <!--<el-table-column-->
+          <!--prop="ownerName"-->
+          <!--label="户主姓名"/>-->
         <el-table-column
           prop="billExplain"
           align="center"

VUECODE/smart-property-manage/src/views/bill/edi/index.vue

@@ -48,9 +48,9 @@
           width="180">
           <template slot-scope="scope">{{ showAddress(scope.row) }}</template>
         </el-table-column>
-        <el-table-column
-          prop="ownerName"
-          label="户主姓名"/>
+        <!--<el-table-column-->
+          <!--prop="ownerName"-->
+          <!--label="户主姓名"/>-->
         <el-table-column
           prop="billInvoiceExplain"
           align="center"

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -82,7 +82,9 @@
       </el-table-column>
       <el-table-column prop="ownerTel" label="手机号" align="center" />
       <el-table-column prop="idCard" label="身份证号" align="center" />
-      <el-table-column prop="roomNoName" label="房间号" align="center" />
+      <el-table-column prop="roomNoName" label="房间号" align="center">
+        <template slot-scope="scope">{{ scope.row.phaseName + scope.row.buildingName + scope.row.unitName + scope.row.levelName + scope.row.roomNoName }}</template>
+      </el-table-column>
       <el-table-column prop="roleName" label="身份" align="center" />
       <el-table-column prop="verifyStatus" label="审核状态" align="center" >
         <template slot-scope="scope">