修改 实体

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java

     @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号", notes = "根据 小区/期/楼栋/单元/楼层/户号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phase", value = "期"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "building", value = "楼栋"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unit", value = "单元"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "level", value = "楼层"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNo", value = "户号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
     })
     public ResponseBean selectByAddress(@RequestParam("communityId") Integer communityId,
-                                        @RequestParam(value = "phase", required = false) String phase,
-                                        @RequestParam(value = "building",required = false) String building,
-                                        @RequestParam(value = "unit", required = false) String unit,
-                                        @RequestParam(value = "level", required = false) String level,
-                                        @RequestParam(value = "roomNo", required = false) String roomNo) {
+                                        @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                        @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                        @RequestParam(value = "unitId", required = false) Integer unitId,
+                                        @RequestParam(value = "levelId", required = false) Integer levelId,
+                                        @RequestParam(value = "roomNoId", required = false) Integer roomNoId) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phase, building, unit, level, roomNo);
+        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId, roomNoId);
         return responseBean;
 
     }
     @RequestMapping(value = "/building/has", method = RequestMethod.GET)
     @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号", notes = "根据 小区、期、楼栋、单元、楼层、户号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phase", value = "期"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "building", value = "楼栋"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unit", value = "单元"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "level", value = "楼层"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNo", value = "户号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    public ResponseBean hasBuilding(@RequestParam(value = "phase", required = false) String phase,
-                                   @RequestParam(value = "building",required = false) String building,
-                                   @RequestParam(value = "unit", required = false) String unit,
-                                   @RequestParam(value = "level", required = false) String level,
-                                   @RequestParam(value = "roomNo", required = false) String roomNo,
+    public ResponseBean hasBuilding(@RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                   @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                   @RequestParam(value = "unitId", required = false) Integer unitId,
+                                   @RequestParam(value = "levelId", required = false) Integer levelId,
+                                   @RequestParam(value = "roomNoId", required = false) Integer roomNoId,
                                    HttpSession session){
 
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfo.hasBuild(userElement, phase, building, unit, level, roomNo);
+        responseBean = iBuildingOwnerInfo.hasBuild(userElement, phaseId, buildingId, unitId, levelId, roomNoId);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

     /**
      * 查询房屋成员列表
      * @param communityId
-     * @param phase
-     * @param building
-     * @param unit
-     * @param level
-     * @param roomNo
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
      * @return
      */
-    List<TaUser> selectHouseUserList(@Param("communityId") Integer communityId, @Param("phase") String phase, @Param("building") String building, @Param("unit") String unit, @Param("level") String level, @Param("roomNo") String roomNo, @Param("userId") Integer userId);
+    List<TaUser> selectHouseUserList(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("userId") Integer userId);
 
     /**
      * 判断当前用户的关联关系

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

     /**
      * 根据 用户id、小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询
      * @param communityId
-     * @param phase
-     * @param building
-     * @param unit
-     * @param level
-     * @param roomNo
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
      * @return
      */
-    TaUserVerify selectCommunityAndAddress(Integer userId,Integer communityId,String phase,String building, String unit,String level,String roomNo);
+    TaUserVerify selectCommunityAndAddress(Integer userId,Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,Integer roomNoId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java

 
     int updateByPrimaryKey(TpBuilding record);
 
-    /**
-     * 根据 小区/期/栋/单元/楼层/户号 进行条件查询
-     * @param communityId
-     * @param phaseId
-     * @param buildingId
-     * @param unitId
-     * @param levelId
-     * @param roomNo
-     * @return
-     */
-    List<TpBuilding> selectByAddress(Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,String roomNo);
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

     //根据手机号查询当前信息
     TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
 
-
-    /**
-     * 查询当前房产所在的小区
-     * @return
-     */
-//    List<TpBuildingOwnerInfo> buildingownerinfoList(@Param("name") String name,@Param("phone") String phone);
-
     /*
      * 根据 小区，期，楼栋，单元，楼层，户号
      * @param communityId
      */
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
-            " and phase=#{phase} and building=#{building} and unit=#{unit}" +
-            " and level=#{level} and room_no=#{roomNo} and verify_status=1")
-    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phase") String phase,
-                                                    @Param("building") String building, @Param("unit") String unit,
-                                                    @Param("level") String level, @Param("roomNo") String roomNo);
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and room_no_id=#{roomNoId} and verify_status=1")
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer level, @Param("roomNoId") Integer roomNoId);
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUserVerify.java

 
     private Integer roleId;
 
-    private String phase;
+    private Integer phaseId;
 
-    private String building;
+    private String phaseName;
 
-    private String unit;
+    private Integer buildingId;
 
-    private String level;
+    private String buildingName;
 
-    private String roomNo;
+    private Integer unitId;
 
-    private String verifyStatus;
-
-    private Date createDate;
+    private String unitName;
 
-    /**
-     * 期
-     */
-    private  String phaseName;
-
-    /**
-     * 栋
-     */
-    private  String buildingName;
+    private Integer levelId;
 
-    /**
-     * 单元
-     */
-    private  String unitName;
+    private String levelName;
 
-    /**
-     * 楼层
-     */
-    private  String levelName;
+    private Integer roomNoId;
 
-    /**
-     * 房间号
-     */
-    private  String roomNoName;
+    private String roomNoName;
 
-    public String getPhaseName() {
-        return phaseName;
-    }
+    private String verifyStatus;
 
-    public void setPhaseName(String phaseName) {
-        this.phaseName = phaseName;
-    }
+    private Date createDate;
 
-    /**
-     * 审核人姓名
-     */
     private String verifyName;
 
     //  ------------------
         this.roleId = roleId;
     }
 
-    public String getPhase() {
-        return phase;
+    public Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
     }
 
-    public void setPhase(String phase) {
-        this.phase = phase == null ? null : phase.trim();
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
     }
 
-    public String getBuilding() {
-        return building;
+    public Integer getLevelId() {
+        return levelId;
     }
 
-    public void setBuilding(String building) {
-        this.building = building == null ? null : building.trim();
+    public void setLevelId(Integer levelId) {
+        this.levelId = levelId;
     }
 
-    public String getUnit() {
-        return unit;
+    public String getLevelName() {
+        return levelName;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit == null ? null : unit.trim();
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
     }
 
-    public String getLevel() {
-        return level;
+    public Integer getRoomNoId() {
+        return roomNoId;
     }
 
-    public void setLevel(String level) {
-        this.level = level == null ? null : level.trim();
+    public void setRoomNoId(Integer roomNoId) {
+        this.roomNoId = roomNoId;
     }
 
-    public String getRoomNo() {
-        return roomNo;
+    public String getRoomNoName() {
+        return roomNoName;
     }
 
-    public void setRoomNo(String roomNo) {
-        this.roomNo = roomNo == null ? null : roomNo.trim();
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
     }
 
     public String getVerifyStatus() {
     }
 
     public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
+        this.verifyStatus = verifyStatus;
     }
 
     public Date getCreateDate() {
         this.createDate = createDate;
     }
 
+    public String getVerifyName() {
+        return verifyName;
+    }
+
+    public void setVerifyName(String verifyName) {
+        this.verifyName = verifyName;
+    }
+
     public String getRoleName() {
         return roleName;
     }
         this.ownerName = ownerName;
     }
 
-    public String getVerifyName() {
-        return verifyName;
-    }
-
-    public void setVerifyName(String verifyName) {
-        this.verifyName = verifyName;
-    }
-
     public String getCommunityName() {
         return communityName;
     }
     public void setCommunityAddress(String communityAddress) {
         this.communityAddress = communityAddress;
     }
-
-    public String getBuildingName() {
-        return buildingName;
-    }
-
-    public String getUnitName() {
-        return unitName;
-    }
-
-    public String getLevelName() {
-        return levelName;
-    }
-
-    public String getRoomNoName() {
-        return roomNoName;
-    }
-
-    public void setBuildingName(String buildingName) {
-        this.buildingName = buildingName;
-    }
-
-    public void setUnitName(String unitName) {
-        this.unitName = unitName;
-    }
-
-    public void setLevelName(String levelName) {
-        this.levelName = levelName;
-    }
-
-    public void setRoomNoName(String roomNoName) {
-        this.roomNoName = roomNoName;
-    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBuilding.java

 
     private Integer communityId;
 
-    private String phase;
+    private Integer phaseId;
 
-    private String building;
+    private String phaseName;
 
-    private String unit;
+    private String name;
 
-    private String level;
-
-    private String roomNo;
+    private String sort;
 
     private Date createDate;
 
         this.communityId = communityId;
     }
 
-    public String getPhase() {
-        return phase;
-    }
-
-    public void setPhase(String phase) {
-        this.phase = phase == null ? null : phase.trim();
-    }
-
-    public String getBuilding() {
-        return building;
+    public Integer getPhaseId() {
+        return phaseId;
     }
 
-    public void setBuilding(String building) {
-        this.building = building == null ? null : building.trim();
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
     }
 
-    public String getUnit() {
-        return unit;
+    public String getPhaseName() {
+        return phaseName;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit == null ? null : unit.trim();
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
     }
 
-    public String getLevel() {
-        return level;
+    public String getName() {
+        return name;
     }
 
-    public void setLevel(String level) {
-        this.level = level == null ? null : level.trim();
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getRoomNo() {
-        return roomNo;
+    public String getSort() {
+        return sort;
     }
 
-    public void setRoomNo(String roomNo) {
-        this.roomNo = roomNo == null ? null : roomNo.trim();
+    public void setSort(String sort) {
+        this.sort = sort;
     }
 
     public Date getCreateDate() {

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

      * @param buildingId
      * @param unitId
      * @param levelId
-     * @param roomNo
+     * @param roomNoId
      * @return
      */
-    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo);
+    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
      * @param buildingId
      * @param unitId
      * @param levelId
-     * @param roomNo
+     * @param roomNoId
      * @return
      */
-    ResponseBean hasBuild(UserElement userElement,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo);
+    ResponseBean hasBuild(UserElement userElement,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 
 }

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

     private TaUserVerifyMapper taUserVerifyMapper;
 
     @Override
-    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo) {
+    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
 
-        List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(communityId, phaseId, buildingId, unitId, levelId, roomNo);
-        responseBean.addSuccess(buildingList);
+
+        responseBean.addSuccess(null);
         return responseBean;
     }
 
     @Override
-    public ResponseBean hasBuild(UserElement userElement,  Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo) {
+    public ResponseBean hasBuild(UserElement userElement,  Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
         // 1.检验该用户关联有没有这个 户号
-        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNo);
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
         if (null != taUserVerify) {
             responseBean.addError("您已关联此房产，无法再次关联！");
             return responseBean;
 
         // TODO 楼栋资料库查询有变动
         // 2.检验这个户号是否关联了 户主
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), phase, building, unit, level, roomNo);
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
         if (null != tpBuildingOwnerInfo) {
             result.put("ownerName",tpBuildingOwnerInfo.getOwnerName());
             result.put("roleName", "OWNER");

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

         // 2. 根据 期、楼栋、单元、楼层、户号、小区id，查询 审核表 得到审核记录
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        List<TaUser> userList = taUserMapper.selectHouseUserList(userElement.getCommunityId(), userVerify.getPhase(), userVerify.getBuilding(), userVerify.getUnit(), userVerify.getLevel(), userVerify.getRoomNo(), userElement.getId());
+        List<TaUser> userList = taUserMapper.selectHouseUserList(userElement.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getId());
 
         responseBean.addSuccess(userList);
         return responseBean;
         userVerify.setCommunityId(userElement.getCommunityId());
         userVerify.setRoleId(sysRole.getId());
         userVerify.setUserId(user.getId());
-        userVerify.setPhase(userElementUserVerify.getPhase());
-        userVerify.setBuilding(userElementUserVerify.getBuilding());
-        userVerify.setUnit(userElementUserVerify.getUnit());
-        userVerify.setLevel(userElementUserVerify.getLevel());
-        userVerify.setRoomNo(userElementUserVerify.getRoomNo());
+        userVerify.setPhaseId(userElementUserVerify.getPhaseId());
+        userVerify.setPhaseName(userElementUserVerify.getPhaseName());
+        userVerify.setBuildingId(userElementUserVerify.getBuildingId());
+        userVerify.setBuildingName(userElementUserVerify.getBuildingName());
+        userVerify.setUnitId(userElementUserVerify.getUnitId());
+        userVerify.setUnitName(userElementUserVerify.getUnitName());
+        userVerify.setLevelId(userElementUserVerify.getLevelId());
+        userVerify.setLevelName(userElementUserVerify.getLevelName());
+        userVerify.setRoomNoId(userElementUserVerify.getRoomNoId());
+        userVerify.setRoomNoName(userElementUserVerify.getRoomNoName());
 
         taUserVerifyMapper.insertSelective(userVerify);
 
 
         // 根据 审核id 查询 出审核的数据，里面有角色id
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(user.getUserVerifyId());
-        userVO.setAddressBuilding(userVerify.getPhase() + userVerify.getBuilding() + userVerify.getUnit() + userVerify.getLevel() + userVerify.getRoomNo());
+        userVO.setAddressBuilding(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
 
         // 角色
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
          */
 
         // TODO 楼栋资料库查询有变动
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(user.getCommunityId(), userVerify.getPhase(), userVerify.getBuilding(), userVerify.getUnit(), userVerify.getLevel(), userVerify.getRoomNo());
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(user.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
 
         if (null != tpBuildingOwnerInfo) {
             //查询当前人业主或租客的信息
             // 设置 userVO 信息
             setUserVoProperties(userVerify.getCommunityId(), taUserVO);
 
-            taUserVO.setAddressBuilding(userVerify.getPhase() + userVerify.getBuilding() + userVerify.getUnit() + userVerify.getLevel() + userVerify.getRoomNo());
+            taUserVO.setAddressBuilding(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
             TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
             taUserVO.setRole(taSysRole.getRoleName());
 
 
         // TODO 楼栋资料库查询有变动
         // 查询出要被删除的房产的 楼栋资料信息
-        TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), userVerify.getPhase(), userVerify.getBuilding(), userVerify.getUnit(), userVerify.getLevel(), userVerify.getRoomNo());
+        TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
         TaUser currentUser = hasUserPhone(buildingOwnerInfo.getOwnerTel());
 
         // 如果业主删除房屋成员(也就是删除房产审核)，房产的业主id 和 当前登录的业主的id，相等的时候才允许删除(相等才能表示是这个业主的房产)

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

 
             // TODO 楼栋资料库查询有变动
             // 开始查询 业主
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getCommunityId(), taUserVerify.getPhase(), taUserVerify.getBuilding(), taUserVerify.getUnit(), taUserVerify.getLevel(), taUserVerify.getRoomNo());
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
             taUserVerify.setOwnerName(tpBuildingOwnerInfo.getOwnerName());
         }
 
             responseBean.addError("该审核不存在！");
             return responseBean;
         }
-        List<TaUser> userList = taUserMapper.selectHouseUserList(userElement.getCommunityId(), userVerify.getPhase(), userVerify.getBuilding(), userVerify.getUnit(), userVerify.getLevel(), userVerify.getRoomNo(), userElement.getId());
+        List<TaUser> userList = taUserMapper.selectHouseUserList(userElement.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getId());
         boolean bool = userList.stream().anyMatch(e -> e.getId().intValue() == userVerify.getId().intValue());
         if (bool) {
             userVerify.setVerifyStatus(userVerifyStatus);

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

     INNER JOIN ta_sys_role tsr ON tuv.role_id = tsr.id
     WHERE
 	tuv.community_id = #{communityId}
-	AND tuv.phase = #{phase}
-	AND tuv.building = #{building}
-	AND tuv.unit = #{unit}
-	AND tuv.`level` = #{level}
-	AND tuv.room_no = #{roomNo}
+	AND tuv.phase_id = #{phaseId}
+	AND tuv.building_id = #{buildingId}
+	AND tuv.unit_id = #{unitId}
+	AND tuv.`level_id` = #{levelId}
+	AND tuv.room_no_id = #{roomNoId}
 	AND tuv.user_id != #{userId}
   </select>
 

CODE/smart-community/app-api/src/main/resources/mapper/TaUserVerifyMapper.xml

     <result column="user_id" property="userId" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="role_id" property="roleId" jdbcType="INTEGER" />
-    <result column="phase" property="phase" jdbcType="VARCHAR" />
-    <result column="building" property="building" jdbcType="VARCHAR" />
-    <result column="unit" property="unit" jdbcType="VARCHAR" />
-    <result column="level" property="level" jdbcType="VARCHAR" />
-    <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
+    <result column="phase_id" property="phaseId" jdbcType="INTEGER" />
+    <result column="phase_name" property="phaseName" jdbcType="VARCHAR" />
+    <result column="building_id" property="buildingId" jdbcType="INTEGER" />
+    <result column="building_name" property="buildingName" jdbcType="VARCHAR" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="unit_name" property="unitName" jdbcType="VARCHAR" />
+    <result column="level_id" property="levelId" jdbcType="INTEGER" />
+    <result column="level_name" property="levelName" jdbcType="VARCHAR" />
+    <result column="room_no_id" property="roomNoId" jdbcType="INTEGER" />
+    <result column="room_no_name" property="roomNoName" jdbcType="VARCHAR" />
     <result column="verify_status" property="verifyStatus" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
-    <result column="verify_name" property="verifyName"/>
-    <result column="phase_name" property="phaseName"/>
-    <result column="building_name" property="buildingName"/>
-    <result column="unit_name" property="unitName"/>
-    <result column="level_name" property="levelName"/>
-    <result column="room_no_name" property="roomNoName"/>
+    <result column="verify_name" property="verifyName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, user_id, community_id, role_id, phase, building, unit, level, room_no, verify_status, 
-     create_date, verify_name, phase_name, building_name, unit_name, room_no_name,level_name
+    id, user_id, community_id, role_id, phase_id, phase_name, building_id, building_name,
+    unit_id, unit_name, level_id, level_name, room_no_id, room_no_name, verify_status,
+    create_date, verify_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from ta_user_verify
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TaUserVerify" >
-    insert into ta_user_verify (id, user_id, community_id, 
-      role_id, phase, building, 
-      unit, level, room_no, 
-      verify_status,
+    insert into ta_user_verify (id, user_id, community_id,
+      role_id, phase_id, phase_name,
+      building_id, building_name, unit_id,
+      unit_name, level_id, level_name,
+      room_no_id, room_no_name, verify_status,
       create_date, verify_name)
-    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, 
-      #{roleId,jdbcType=INTEGER}, #{phase,jdbcType=VARCHAR}, #{building,jdbcType=VARCHAR}, 
-      #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, 
-      #{verifyStatus,jdbcType=VARCHAR},
-      #{createDate,jdbcType=TIMESTAMP}, #{verifyName})
+    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},
+      #{roleId,jdbcType=INTEGER}, #{phaseId,jdbcType=INTEGER}, #{phaseName,jdbcType=VARCHAR},
+      #{buildingId,jdbcType=INTEGER}, #{buildingName,jdbcType=VARCHAR}, #{unitId,jdbcType=INTEGER},
+      #{unitName,jdbcType=VARCHAR}, #{levelId,jdbcType=INTEGER}, #{levelName,jdbcType=VARCHAR},
+      #{roomNoId,jdbcType=INTEGER}, #{roomNoName,jdbcType=VARCHAR}, #{verifyStatus,jdbcType=VARCHAR},
+      #{createDate,jdbcType=TIMESTAMP}, #{verifyName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" >
     insert into ta_user_verify
       <if test="roleId != null" >
         role_id,
       </if>
-      <if test="phase != null" >
-        phase,
+      <if test="phaseId != null" >
+        phase_id,
+      </if>
+      <if test="phaseName != null" >
+        phase_name,
+      </if>
+      <if test="buildingId != null" >
+        building_id,
+      </if>
+      <if test="buildingName != null" >
+        building_name,
       </if>
-      <if test="building != null" >
-        building,
+      <if test="unitId != null" >
+        unit_id,
       </if>
-      <if test="unit != null" >
-        unit,
+      <if test="unitName != null" >
+        unit_name,
       </if>
-      <if test="level != null" >
-        level,
+      <if test="levelId != null" >
+        level_id,
       </if>
-      <if test="roomNo != null" >
-        room_no,
+      <if test="levelName != null" >
+        level_name,
+      </if>
+      <if test="roomNoId != null" >
+        room_no_id,
+      </if>
+      <if test="roomNoName != null" >
+        room_no_name,
       </if>
       <if test="verifyStatus != null" >
         verify_status,
       <if test="createDate != null" >
         create_date,
       </if>
-      <if test="verifyName != null">
-          verify_name,
+      <if test="verifyName != null" >
+        verify_name,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="roleId != null" >
         #{roleId,jdbcType=INTEGER},
       </if>
-      <if test="phase != null" >
-        #{phase,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        #{phaseId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseName != null" >
+        #{phaseName,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingId != null" >
+        #{buildingId,jdbcType=INTEGER},
       </if>
-      <if test="building != null" >
-        #{building,jdbcType=VARCHAR},
+      <if test="buildingName != null" >
+        #{buildingName,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
-        #{unit,jdbcType=VARCHAR},
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
       </if>
-      <if test="level != null" >
-        #{level,jdbcType=VARCHAR},
+      <if test="unitName != null" >
+        #{unitName,jdbcType=VARCHAR},
       </if>
-      <if test="roomNo != null" >
-        #{roomNo,jdbcType=VARCHAR},
+      <if test="levelId != null" >
+        #{levelId,jdbcType=INTEGER},
+      </if>
+      <if test="levelName != null" >
+        #{levelName,jdbcType=VARCHAR},
+      </if>
+      <if test="roomNoId != null" >
+        #{roomNoId,jdbcType=INTEGER},
+      </if>
+      <if test="roomNoName != null" >
+        #{roomNoName,jdbcType=VARCHAR},
       </if>
       <if test="verifyStatus != null" >
         #{verifyStatus,jdbcType=VARCHAR},
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="verifyName != null">
-          #{verifyName},
+      <if test="verifyName != null" >
+        #{verifyName,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
       <if test="roleId != null" >
         role_id = #{roleId,jdbcType=INTEGER},
       </if>
-      <if test="phase != null" >
-        phase = #{phase,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        phase_id = #{phaseId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseName != null" >
+        phase_name = #{phaseName,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingId != null" >
+        building_id = #{buildingId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingName != null" >
+        building_name = #{buildingName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="unitName != null" >
+        unit_name = #{unitName,jdbcType=VARCHAR},
       </if>
-      <if test="building != null" >
-        building = #{building,jdbcType=VARCHAR},
+      <if test="levelId != null" >
+        level_id = #{levelId,jdbcType=INTEGER},
       </if>
-      <if test="unit != null" >
-        unit = #{unit,jdbcType=VARCHAR},
+      <if test="levelName != null" >
+        level_name = #{levelName,jdbcType=VARCHAR},
       </if>
-      <if test="level != null" >
-        level = #{level,jdbcType=VARCHAR},
+      <if test="roomNoId != null" >
+        room_no_id = #{roomNoId,jdbcType=INTEGER},
       </if>
-      <if test="roomNo != null" >
-        room_no = #{roomNo,jdbcType=VARCHAR},
+      <if test="roomNoName != null" >
+        room_no_name = #{roomNoName,jdbcType=VARCHAR},
       </if>
       <if test="verifyStatus != null" >
         verify_status = #{verifyStatus,jdbcType=VARCHAR},
       <if test="createDate != null" >
         create_date = #{createDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="verifyName != null">
-          verify_name = #{verifyName}
+      <if test="verifyName != null" >
+        verify_name = #{verifyName,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
     set user_id = #{userId,jdbcType=INTEGER},
       community_id = #{communityId,jdbcType=INTEGER},
       role_id = #{roleId,jdbcType=INTEGER},
-      phase = #{phase,jdbcType=VARCHAR},
-      building = #{building,jdbcType=VARCHAR},
-      unit = #{unit,jdbcType=VARCHAR},
-      level = #{level,jdbcType=VARCHAR},
-      room_no = #{roomNo,jdbcType=VARCHAR},
+      phase_id = #{phaseId,jdbcType=INTEGER},
+      phase_name = #{phaseName,jdbcType=VARCHAR},
+      building_id = #{buildingId,jdbcType=INTEGER},
+      building_name = #{buildingName,jdbcType=VARCHAR},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      unit_name = #{unitName,jdbcType=VARCHAR},
+      level_id = #{levelId,jdbcType=INTEGER},
+      level_name = #{levelName,jdbcType=VARCHAR},
+      room_no_id = #{roomNoId,jdbcType=INTEGER},
+      room_no_name = #{roomNoName,jdbcType=VARCHAR},
       verify_status = #{verifyStatus,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP},
-      verify_name = #{verifyName}
+      verify_name = #{verifyName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByUserId" resultMap="BaseResultMap" parameterType="integer">
     from ta_user_verify
     where community_id = #{communityId,jdbcType=INTEGER}
     and user_id = #{userId,jdbcType=INTEGER}
-    and phase = #{phase,jdbcType=VARCHAR}
-    and building = #{building,jdbcType=VARCHAR}
-    and unit = #{unit,jdbcType=VARCHAR}
-    and level = #{level,jdbcType=VARCHAR}
-    and room_no = #{roomNo,jdbcType=VARCHAR}
+    and phase_id = #{phaseId,jdbcType=INTEGER}
+    and building_id = #{buildingId,jdbcType=INTEGER}
+    and unit_id = #{unitId,jdbcType=INTEGER}
+    and level_id = #{levelId,jdbcType=INTEGER}
+    and room_no_id = #{roomNoId,jdbcType=INTEGER}
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpBuildingMapper.xml

   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpBuilding" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="phase" property="phase" jdbcType="VARCHAR" />
-    <result column="building" property="building" jdbcType="VARCHAR" />
-    <result column="unit" property="unit" jdbcType="VARCHAR" />
-    <result column="level" property="level" jdbcType="VARCHAR" />
-    <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
+    <result column="phase_id" property="phaseId" jdbcType="INTEGER" />
+    <result column="phase_name" property="phaseName" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, phase, building, unit, level, room_no, create_date
+    id, community_id, phase_id, phase_name, name, sort, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from tp_building
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpBuilding" >
-    insert into tp_building (id, community_id, phase, 
-      building, unit, level, 
-      room_no, create_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{phase,jdbcType=VARCHAR}, 
-      #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, 
-      #{roomNo,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP})
+    insert into tp_building (id, community_id, phase_id,
+      phase_name, name, sort,
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{phaseId,jdbcType=INTEGER},
+      #{phaseName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
+      #{createDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuilding" >
     insert into tp_building
       <if test="communityId != null" >
         community_id,
       </if>
-      <if test="phase != null" >
-        phase,
-      </if>
-      <if test="building != null" >
-        building,
+      <if test="phaseId != null" >
+        phase_id,
       </if>
-      <if test="unit != null" >
-        unit,
+      <if test="phaseName != null" >
+        phase_name,
       </if>
-      <if test="level != null" >
-        level,
+      <if test="name != null" >
+        name,
       </if>
-      <if test="roomNo != null" >
-        room_no,
+      <if test="sort != null" >
+        sort,
       </if>
       <if test="createDate != null" >
         create_date,
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="phase != null" >
-        #{phase,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        #{phaseId,jdbcType=INTEGER},
       </if>
-      <if test="building != null" >
-        #{building,jdbcType=VARCHAR},
+      <if test="phaseName != null" >
+        #{phaseName,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
-        #{unit,jdbcType=VARCHAR},
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
       </if>
-      <if test="level != null" >
-        #{level,jdbcType=VARCHAR},
-      </if>
-      <if test="roomNo != null" >
-        #{roomNo,jdbcType=VARCHAR},
+      <if test="sort != null" >
+        #{sort,jdbcType=VARCHAR},
       </if>
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
-      <if test="phase != null" >
-        phase = #{phase,jdbcType=VARCHAR},
-      </if>
-      <if test="building != null" >
-        building = #{building,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        phase_id = #{phaseId,jdbcType=INTEGER},
       </if>
-      <if test="unit != null" >
-        unit = #{unit,jdbcType=VARCHAR},
+      <if test="phaseName != null" >
+        phase_name = #{phaseName,jdbcType=VARCHAR},
       </if>
-      <if test="level != null" >
-        level = #{level,jdbcType=VARCHAR},
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="roomNo != null" >
-        room_no = #{roomNo,jdbcType=VARCHAR},
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=VARCHAR},
       </if>
       <if test="createDate != null" >
         create_date = #{createDate,jdbcType=TIMESTAMP},
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpBuilding" >
     update tp_building
     set community_id = #{communityId,jdbcType=INTEGER},
-      phase = #{phase,jdbcType=VARCHAR},
-      building = #{building,jdbcType=VARCHAR},
-      unit = #{unit,jdbcType=VARCHAR},
-      level = #{level,jdbcType=VARCHAR},
-      room_no = #{roomNo,jdbcType=VARCHAR},
+      phase_id = #{phaseId,jdbcType=INTEGER},
+      phase_name = #{phaseName,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=VARCHAR},
       create_date = #{createDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="selectByAddress" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List"/>
-    from tp_building
-    where community_id = #{communityId,jdbcType=INTEGER}
-    <if test="phase != null and phase != ''">
-      and phase = #{phase,jdbcType=VARCHAR}
-    </if>
-    <if test="building != null and building != ''">
-      and building = #{building,jdbcType=VARCHAR}
-    </if>
-    <if test="unit != null and unit != ''">
-      and unit = #{unit,jdbcType=VARCHAR}
-    </if>
-    <if test="level != null and level != ''">
-      and level = #{level,jdbcType=VARCHAR}
-    </if>
-    <if test="roomNo != null and roomNo != ''">
-      and roomNo = #{room_no,jdbcType=VARCHAR}
-    </if>
-  </select>
 </mapper>

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

     where community_id = #{communityId,jdbcType=INTEGER} and wnerTel =  owner_tel = #{ownerTel,jdbcType=VARCHAR}
   </update>
 
-  <select id="selectOwnerTel" resultType="com.community.huiju.model.TpBuildingOwnerInfo" parameterType="string">
+  <select id="selectOwnerTel" resultMap="BaseResultMap" parameterType="string">
     select
-    id
+    <include refid="Base_Column_List"/>
     from
     tp_building_owner_info
     where  owner_tel = #{ownerTel,jdbcType=VARCHAR}