楼栋资料

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -38,8 +38,8 @@ import java.util.Map;
  */
 @RestController
 
-@RequestMapping("/")
-@Api(value = "楼栋业主资料信息", description = "楼栋业主资料信息 Api")
+@RequestMapping("/api")
+@Api(value = "楼栋业主资料信息", tags = "楼栋业主资料信息 Api")
 public class BuildingOwnerInfoController extends BaseController {
 
     @Autowired
@@ -327,4 +327,51 @@ public class BuildingOwnerInfoController extends BaseController {
         ResponseBean buildinglist=iBuildingOwnerInfoService.buildingDetails(paramets,userElement);
         return buildinglist;
     }
+
+    @RequestMapping(value = "/wx/building/select/address", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号 (申请注册绑定)", notes = "根据 小区/期/楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "orgId", value = "传1"),
+            @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 = "楼层")
+    })
+    public ResponseBean selectByAddress(@RequestParam("orgId") Integer orgId,
+                                        @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) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.selectBuildList(orgId, phaseId, buildingId, unitId, levelId);
+        return responseBean;
+
+    }
+
+    @RequestMapping(value = "/wx/building/has", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号 （并校验这个用户，是否绑定了这个房产）", notes = "根据 小区、期、楼栋、单元、楼层、户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "orgId", value = "传1"),
+            @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 = "orgId", required = false) Integer orgId,
+                                    @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,
+                                    HttpServletRequest request){
+
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.hasBuild(userElement, orgId ,phaseId, buildingId, unitId, levelId, roomNoId);
+        return responseBean;
+    }
+
 }

src/main/java/com/huiju/estateagents/property/dao/BillStatementMapper.java

@@ -28,6 +28,6 @@ public interface BillStatementMapper extends BaseMapper<BillStatement> {
      * @return
      */
     @ResultType(BillStatement.class)
-    @Select("select *  from tp_bill_statement where community_id = #{orgId} and bill_invoice_id = #{tpBillInvoiceId}")
+    @Select("select *  from tp_bill_statement where org_id = #{orgId} and bill_invoice_id = #{tpBillInvoiceId}")
     BillStatement selectByCommunityIdAndBillInvoiceId(Integer orgId, Integer tpBillInvoiceId);
 }

src/main/java/com/huiju/estateagents/property/dao/TaSysUserRoleMapper.java

@@ -23,7 +23,7 @@ public interface TaSysUserRoleMapper extends BaseMapper<TaSysUserRole> {
      * @param userId
      * @return
      */
-    @Delete("delete from ta_sys_user_role where community_id=#{orgId} and user_id=#{userId}")
+    @Delete("delete from ta_sys_user_role where org_id=#{orgId} and user_id=#{userId}")
     int deleteByCommunityIdAndUserId(@Param("orgId") Integer orgId, @Param("userId") Integer userId);
 
 }

src/main/java/com/huiju/estateagents/property/dao/TaUserLicenseOrderMapper.java

@@ -29,7 +29,7 @@ public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder>
      * @return
      */
     @ResultType(TaUserLicenseOrder.class)
-    @Select("select * from ta_user_license_order where community_id = #{orgId} limit #{pageNum},#{pageSize}")
+    @Select("select * from ta_user_license_order where org_id = #{orgId} limit #{pageNum},#{pageSize}")
     List<TaUserLicenseOrder> getLicensePage(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
@@ -38,7 +38,7 @@ public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder>
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(*) from ta_user_license_order where community_id = #{orgId}")
+    @Select("select count(*) from ta_user_license_order where org_id = #{orgId}")
     Integer getCount(@Param("orgId") Integer orgId);
     
     

src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.property.model.TaUserVerify;
-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 org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -69,7 +66,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      */
     @ResultType(TaUserVerify.class)
     @Select("select  *  from ta_user_verify " +
-            "where community_id = #{orgId} " +
+            "where org_id = #{orgId} " +
             "and phase_name = #{phaseName} " +
             "and building_name = #{buildingName} " +
             "and unit_name = #{unitName} " +
@@ -100,4 +97,47 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
                                                            @Param("levelId") Integer levelId,
                                                            @Param("roomNoId") Integer roomNoId,
                                                            @Param("verifyStatus") Integer verifyStatus);
+
+    /**
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态  进行条件查询
+     * @param orgId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param verifyStatus
+     * @return
+     */
+    List<TaUserVerify> selectWxCommunityAndAddress(@Param("userId") Integer userId,
+                                                 @Param("orgId") Integer orgId,
+                                                 @Param("phaseId") Integer phaseId,
+                                                 @Param("buildingId") Integer buildingId,
+                                                 @Param("unitId") Integer unitId,
+                                                 @Param("levelId") Integer levelId,
+                                                 @Param("roomNoId") Integer roomNoId,
+                                                 @Param("verifyStatus") Integer verifyStatus);
+
+    /**
+     * 根据 小区id 、 期、栋、单元、楼层、户号, 角色id(业主), 审核通过(值为1) 进行条件查询
+     * @param orgId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultType(TaUserVerify.class)
+    @Select("select * from ta_user_verify where org_id=#{orgId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and role_id=1 and verify_status=1")
+    TaUserVerify selectWxCommunityAndAddressAndRoleId(@Param("orgId") Integer orgId,
+                                                    @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer buildingId,
+                                                    @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer levelId,
+                                                    @Param("roomNoId") Integer roomNoId);
+
 }

src/main/java/com/huiju/estateagents/property/dao/ToCommunitiesMapper.java

@@ -23,7 +23,7 @@ public interface ToCommunitiesMapper extends BaseMapper<ToCommunities> {
      * @param phone
      * @return
      */
-    @Select("SELECT tc.* FROM tp_user tu LEFT JOIN to_communities tc ON tu.community_id = tc.id WHERE tu.login_name = #{phone}")
+    @Select("SELECT tc.* FROM tp_user tu LEFT JOIN to_communities tc ON tu.org_id = tc.id WHERE tu.login_name = #{phone}")
     List<ToCommunities> selectUserById(String phone);
 
 }

src/main/java/com/huiju/estateagents/property/dao/TpBillOrderMapper.java

@@ -36,7 +36,7 @@ public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
     @ResultType(TpBillOrder.class)
     @Select("select " +
             "tbo.id as id, " +
-            "tbo.community_id as orgId, " +
+            "tbo.org_id as orgId, " +
             "tbo.tp_bill_id as tpBillId, " +
             "tbo.tp_bill_invoice_id as tpBillInvoiceId, " +
             "tbo.order_bumber as orderBumber, " +

src/main/java/com/huiju/estateagents/property/dao/TpBuildingMapper.java

@@ -3,8 +3,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.property.model.TpBuilding;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
 
 @Mapper
 public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
@@ -16,4 +17,14 @@ public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
      * @return
      */
     IPage<TpBuilding> buildinglist(Page<TpBuilding> page, @Param("tpBuilding") TpBuilding tpBuilding);
+
+    /**
+     * 根据小区id，期id
+     * @param orgId
+     * @param phaseId
+     * @return
+     */
+    @ResultType(TpBuilding.class)
+    @Select("select * from tp_building where org_id=#{orgId} and phase_id=#{phaseId}")
+    List<TpBuilding> selectByAddress(@Param("orgId") Integer orgId, @Param("phaseId") Integer phaseId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpBuildingOwnerInfoMapper.java

@@ -26,7 +26,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      * @param
      * @return
      */
-    IPage<TpBuildingOwnerInfo> selectUserApprove(Page page, @Param("ownerName") String r, @Param("ownerTel") String ownerTel, @Param("VerifyStatus") String VerifyStatus, @Param("CommunityId") Integer CommunityId);
+    IPage<TpBuildingOwnerInfo> selectUserApprove(Page page, @Param("ownerName") String r, @Param("ownerTel") String ownerTel, @Param("VerifyStatus") String VerifyStatus, @Param("orgId") Integer orgId);
 
     int batchInsert(List<TpBuildingOwnerInfo> list);
 
@@ -47,7 +47,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      */
 	@ResultType(TpBuildingOwnerInfo.class)
 	@Select("select * FROM tp_building_owner_info tpio " +
-            "WHERE tpio.community_id = #{orgId} " +
+            "WHERE tpio.org_id = #{orgId} " +
             "and tpio.phase_id = #{phaseId} " +
             "and tpio.building_id = #{buildingId} " +
             "and tpio.unit_id = #{unitId} " +
@@ -70,7 +70,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      */
     @ResultType(TpBuildingOwnerInfo.class)
     @Select("select * FROM tp_building_owner_info tpio " +
-            "WHERE tpio.community_id = #{orgId} " +
+            "WHERE tpio.org_id = #{orgId} " +
             "and tpio.phase_name = #{phaseName} " +
             "and tpio.building_name = #{buildingName} " +
             "and tpio.unit_name = #{unitName} " +

src/main/java/com/huiju/estateagents/property/dao/TpEquipmentMapper.java

@@ -36,7 +36,7 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
             "FROM " +
             "tp_equipment tm " +
-            "where tm.community_id = #{orgId} and tm.equipment_type = #{equipmentType}")
+            "where tm.org_id = #{orgId} and tm.equipment_type = #{equipmentType}")
     List<TpEquipment> selectAllByCommunityAndEquipmentType(@Param("orgId") Integer orgId, @Param("equipmentType") Integer equipmentType);
 
 
@@ -56,7 +56,7 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
             "FROM " +
             "tp_equipment tm " +
-            "where tm.community_id = #{orgId} and tm.equipment_type = #{equipmentType} and tm.id = #{monitoringId}")
+            "where tm.org_id = #{orgId} and tm.equipment_type = #{equipmentType} and tm.id = #{monitoringId}")
     TpEquipment getMonitoringById(@Param("orgId") Integer orgId, @Param("equipmentType") Integer equipmentType, @Param("monitoringId") Integer monitoringId);
 
 

src/main/java/com/huiju/estateagents/property/dao/TpLevelMapper.java

@@ -3,6 +3,11 @@ package com.huiju.estateagents.property.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpLevel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +19,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TpLevelMapper extends BaseMapper<TpLevel> {
-
+    /**
+     * 根据 小区id，期id，楼栋id，单元id 进行查询
+     * @param orgId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @return
+     */
+    @ResultType(TpLevel.class)
+    @Select("select * from tp_level where org_id=#{orgId} and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}")
+    List<TpLevel> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpPhaseMapper.java

@@ -2,7 +2,9 @@ package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpPhase;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpPhaseMapper extends BaseMapper<TpPhase> {
 
+    /**
+     * 根据小区查询 期
+     * @param orgId
+     * @return
+     */
+    @ResultType(TpPhase.class)
+    @Select("select * from tp_phase where org_id = #{orgId}")
+    List<TpPhase> selectByAddress(@Param("orgId") Integer orgId);
+
 }

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -2,10 +2,7 @@ package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.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 org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -33,7 +30,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      */
     @ResultType(TpRoomNo.class)
     @Select("select * from tp_room_no " +
-            "where community_id = #{orgId} " +
+            "where org_id = #{orgId} " +
             "and phase_name = #{phaseName} " +
             "and building_name = #{buildingName} " +
             "and unit_name = #{unitName} " +
@@ -48,7 +45,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no where community_id = #{orgId} limit #{pageNum},#{pageSize}")
+    @Select("select * from tp_room_no where org_id = #{orgId} limit #{pageNum},#{pageSize}")
     List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
@@ -57,7 +54,15 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(Long.class)
-    @Select("select count(1) from tp_room_no where community_id = #{orgId}")
+    @Select("select count(1) from tp_room_no where org_id = #{orgId}")
     Long selectCommunityIdCount(@Param("orgId") Integer orgId);
 
+    @ResultType(TpRoomNo.class)
+    @Select("select * from tp_room_no where org_id=#{orgId} " +
+            "and phase_id=#{phaseId} " +
+            "and building_id=#{buildingId} " +
+            "and unit_id=#{unitId} " +
+            "and level_id=#{levelId}")
+    List<TpRoomNo> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
+
 }

src/main/java/com/huiju/estateagents/property/dao/TpUnitMapper.java

@@ -3,6 +3,11 @@ package com.huiju.estateagents.property.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpUnit;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +20,15 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpUnitMapper extends BaseMapper<TpUnit> {
 
+    /**
+     * 根据 小区id，期id，楼栋id 查询
+     * @param orgId
+     * @param phaseId
+     * @param buildingId
+     * @return
+     */
+    @ResultType(TpUnit.class)
+    @Select("select * from tp_unit where org_id =#{orgId} and phase_id=#{phaseId} and building_id=#{buildingId}")
+    List<TpUnit> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId);
+
 }

src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java

@@ -158,4 +158,27 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean buildingDetails(String paramets, TaUser userElement);
+
+    /**
+     * 根据 小区/期/楼栋/单元/楼层/户号
+     * @param orgId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @return
+     */
+    ResponseBean selectBuildList(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
+
+    /**
+     * 根据 小区/期/楼栋/单元/楼层/户号
+     * 并校验这个用户，是否绑定了这个房产
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    ResponseBean hasBuild(TaUser userElement, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 }

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -742,7 +742,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
     @Override
-    public ResponseBean selectUserApprove(String paramets,Integer CommunityId) {
+    public ResponseBean selectUserApprove(String paramets,Integer orgId) {
 
         ResponseBean responseBean = new ResponseBean();
 
@@ -756,7 +756,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TpBuildingOwnerInfo> ownerInfoIPage = tpBuildingOwnerInfoMapper.selectUserApprove(page, tpBuildingOwnerInfo.getOwnerName(),tpBuildingOwnerInfo.getOwnerTel(),tpBuildingOwnerInfo.getVerifyStatus(),CommunityId);
+        IPage<TpBuildingOwnerInfo> ownerInfoIPage = tpBuildingOwnerInfoMapper.selectUserApprove(page, tpBuildingOwnerInfo.getOwnerName(),tpBuildingOwnerInfo.getOwnerTel(),tpBuildingOwnerInfo.getVerifyStatus(),orgId);
         List<TpBuildingOwnerInfo> infoList = ownerInfoIPage.getRecords();
         infoList.stream().forEach(e->{
             if (null!=e.getBuildingName()&&!"".equals(e.getBuildingName())&&isNumeric(e.getBuildingName())){
@@ -1173,4 +1173,67 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         response.addSuccess(map);
         return response;
     }
+
+
+    @Override
+    public ResponseBean selectBuildList(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
+        if (null == phaseId && null == buildingId && null == unitId && null == levelId) {
+            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(orgId);
+            responseBean.addSuccess(phaseList);
+        } else if (null == buildingId && null == unitId && null == levelId) {
+            List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(orgId, phaseId);
+            responseBean.addSuccess(buildingList);
+        } else if (null == unitId && null == levelId) {
+            List<TpUnit> unitList = tpUnitMapper.selectByAddress(orgId, phaseId, buildingId);
+            responseBean.addSuccess(unitList);
+        } else if (null == levelId) {
+            List<TpLevel> levelList = tpLevelMapper.selectByAddress(orgId, phaseId, buildingId, unitId);
+            responseBean.addSuccess(levelList);
+        } else {
+            List<TpRoomNo> roomNoList = tpRoomNoMapper.selectByAddress(orgId, phaseId, buildingId, unitId, levelId);
+            responseBean.addSuccess(roomNoList);
+        }
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean hasBuild(TaUser userElement, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+        ResponseBean responseBean = new ResponseBean();
+        // 1.检验该用户关联有没有这个 户号，审核通过的
+        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(userElement.getUserId(),userElement.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
+        // List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
+        if (null != taUserVerifyEqVerifyStatus1 && taUserVerifyEqVerifyStatus1.size() > 0) {
+            responseBean.addError("你已关联此房间，无法再次关联！");
+            return  responseBean;
+        }
+
+        // 1.检验该用户关联有没有这个 户号，待审核
+        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(userElement.getUserId(),userElement.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 0);
+        if (null != taUserVerifyEqVerifyStatus0 && taUserVerifyEqVerifyStatus0.size() > 0) {
+            responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，再进行下一步操作！");
+            return responseBean;
+        }
+
+
+        Map<String,Object> result = Maps.newHashMap();
+
+        // 2.检验这个户号是否关联了 户主
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(orgId, phaseId, buildingId, unitId, levelId, roomNoId);
+        if (null != ownerUserVerify) {
+            TaUser user = taUserMapper.selectById(ownerUserVerify.getUserId());
+            result.put("ownerName",user.getUserName());
+            result.put("roleName", "OWNER");
+            responseBean.addSuccess(result);
+            return responseBean;
+        }
+
+        result.put("ownerName",null);
+        result.put("roleName", null);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }

src/main/resources/mapper/property/AnnouncementTelMapper.xml

@@ -4,7 +4,7 @@
     <select id="selectListByParams" resultType="com.huiju.estateagents.property.model.AnnouncementTel">
        SELECT
             t.id,
-            t.community_id AS orgId,
+            t.org_id AS orgId,
             t.NAME,
             t.tel,
             t.remark,
@@ -15,7 +15,7 @@
             LEFT JOIN tp_user u ON t.update_user = u.id
         WHERE
             1 = 1
-        AND t.community_id = #{announcementTel.orgId}
+        AND t.org_id = #{announcementTel.orgId}
         <if test="announcementTel.tel != null and announcementTel.tel != ''">
           AND t.tel like concat('%',#{announcementTel.tel},'%')
         </if>

src/main/resources/mapper/property/BillInvoiceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.BillInvoiceMapper">
     <sql id="Base_Column_List" >
-    id, community_id, bill_id, building_owner_info_id, ta_user_id, bill_invoice_explain,
+    id, org_id, bill_id, building_owner_info_id, ta_user_id, bill_invoice_explain,
     pay_price, bill_statement_id, bill_status, pay_name, pay_date, create_user, create_date,
     update_user, update_date, pay_type
   </sql>
@@ -50,7 +50,7 @@
                     AND tpi.bill_id = #{map.billId}
                 </if>
                 <if test="map.orgId != null">
-                    AND tpi.community_Id = #{map.orgId}
+                    AND tpi.org_id = #{map.orgId}
                 </if>
                 AND tpi.status = 1
             </trim>
@@ -78,7 +78,7 @@
                     AND tpi.bill_id = #{map.billId}
                 </if>
                 <if test="map.orgId != null">
-                    AND tpi.community_Id = #{map.orgId}
+                    AND tpi.org_id = #{map.orgId}
                 </if>
                 AND tpi.status = 0
             </trim>
@@ -109,7 +109,7 @@
                     AND tpi.bill_id = #{map.billId}
                 </if>
                 <if test="map.orgId != null">
-                    AND tpi.community_Id = #{map.orgId}
+                    AND tpi.org_id = #{map.orgId}
                 </if>
                 AND tpi.status = 1
             </trim>
@@ -120,14 +120,14 @@
     <select id="getPriceCount" resultType="map">
         SELECT
             sum( pay_price ) AS totalPrice,
-            community_id AS orgId
+            org_id AS orgId
         FROM
             tp_bill_invoice
         WHERE
             `status` = 1
         AND bill_status = 1
         GROUP BY
-            community_id
+            org_id
     </select>
 
     <select id="getBillsList" resultType="map">
@@ -145,7 +145,7 @@
         FROM
         tp_bill_invoice i
         LEFT JOIN tp_bill b ON b.id = i.bill_id
-        AND b.community_id = #{communityId,jdbcType=INTEGER}
+        AND b.org_id = #{communityId,jdbcType=INTEGER}
         WHERE
         i.orgId = #{orgId,jdbcType=INTEGER}
         <if test="payType == 0">
@@ -188,7 +188,7 @@
     <select id="selectByIdAndroomNoId" resultType="com.huiju.estateagents.property.model.BillInvoice" >
     SELECT
         t.id,
-        t.community_id AS communityId,
+        t.org_id AS orgId,
         t.bill_id AS billId,
         t.building_owner_info_id AS buildingOwnerInfoId,
         t.ta_user_id AS taUserId,
@@ -201,9 +201,9 @@
         b.bill_name as billName
     FROM
 	    tp_bill_invoice t
-	LEFT JOIN tp_bill b ON t.bill_id = b.id and b.community_id = #{communityId,jdbcType=INTEGER}
+	LEFT JOIN tp_bill b ON t.bill_id = b.id and b.org_id = #{orgId,jdbcType=INTEGER}
     where t.id = #{id,jdbcType=INTEGER}
-    and t.community_id = #{communityId,jdbcType=INTEGER}
+    and t.org_id = #{orgId,jdbcType=INTEGER}
     and t.status = 1
     and t.room_no_id = #{roomNoId,jdbcType=INTEGER}
   </select>
@@ -211,7 +211,7 @@
     <select id="selectByOutTradeNo" resultType="com.huiju.estateagents.property.model.BillInvoice" >
   SELECT
         t.id,
-        t.community_id AS communityId,
+        t.org_id AS communityId,
         t.bill_id AS billId,
         t.building_owner_info_id AS buildingOwnerInfoId,
         t.ta_user_id AS taUserId,

src/main/resources/mapper/property/BillMapper.xml

@@ -4,7 +4,7 @@
     <select id="selectListByParams" resultType="com.huiju.estateagents.property.model.Bill">
         SELECT
             t.id,
-            t.community_id,
+            t.org_id,
             t.bill_name,
             t.bill_explain,
             t.pay_total_num,
@@ -20,7 +20,7 @@
             tp_bill t
         WHERE
         1 = 1
-        AND t.community_id = #{bill.orgId}
+        AND t.org_id = #{bill.orgId}
         <if test="bill.id != null and bill.id != '' or bill.id ==0">
             and t.id like concat('%',#{bill.id},'%')
         </if>

src/main/resources/mapper/property/BillOrderMapper.xml

@@ -28,7 +28,7 @@
                     and tbo.pay_phone like CONCAT('%', #{map.payPhone},'%')
                 </if>
                 <if test="map.orgId != null">
-                    and tbo.community_id = #{map.orgId}
+                    and tbo.org_id = #{map.orgId}
                 </if>
             </trim>
         </where>

src/main/resources/mapper/property/BillStatementMapper.xml

@@ -29,7 +29,7 @@
                     and tbs.pay_name like CONCAT('%', #{map.payName},'%')
                 </if>
                 <if test="map.orgId != null">
-                    and tbs.community_id = #{map.orgId}
+                    and tbs.org_id = #{map.orgId}
                 </if>
             </trim>
         </where>

src/main/resources/mapper/property/HotelMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.HotelMapper">
  <select id="selectHotel" resultType="com.huiju.estateagents.property.model.Hotel">
-  select * from tp_hotel where community_id = #{orgId};
+  select * from tp_hotel where org_id = #{orgId};
  </select>
 </mapper>

src/main/resources/mapper/property/HotelRoomMapper.xml

@@ -22,7 +22,7 @@
                 AND date_format(create_date, '%Y-%m-%d') <![CDATA[>= ]]> date_format(#{beginTime}, '%Y-%m-%d')
                 AND date_format(create_date, '%Y-%m-%d')<![CDATA[<= ]]> date_format(#{endTime}, '%Y-%m-%d')
             </if>
-            and community_id = #{orgId}
+            and org_id = #{orgId}
         </where>
         order by sort desc,update_date desc
     </select>

src/main/resources/mapper/property/IndexCountMapper.xml

@@ -5,14 +5,14 @@
  <select id="getTicketList" resultType="com.huiju.estateagents.property.model.TpTicket">
     SELECT
         id,
-        community_id,
+        org_id,
         `status`,
         type,
         repair_type,
         create_date
     FROM
         tp_ticket
-    WHERE community_id = #{orgId}
+    WHERE org_id = #{orgId}
  </select>
 
     <select id="selectCommunityOpenDoorCount" parameterType="java.lang.Integer" resultType="java.lang.Integer" >
@@ -28,15 +28,15 @@
     </select>
 
     <select id="getPublicCameraCount" resultType="java.lang.Integer">
-        SELECT count(id) FROM ta_public_monitor WHERE community_id = #{orgId}
+        SELECT count(id) FROM ta_public_monitor WHERE org_id = #{orgId}
     </select>
 
     <select id="getRemoteMonitoringCount" resultType="java.lang.Integer">
-        SELECT count(id) FROM ta_remotely_monitor WHERE community_id = #{orgId}
+        SELECT count(id) FROM ta_remotely_monitor WHERE org_id = #{orgId}
     </select>
 
     <select id="getRemoteUnitCount" resultType="java.lang.Integer">
-        SELECT count(id) FROM ta_remotely_door WHERE community_id = #{orgId}
+        SELECT count(id) FROM ta_remotely_door WHERE org_id = #{orgId}
     </select>
 
     <select id="getBillInvoiceCountList" resultType="com.huiju.estateagents.property.model.TpBillInvoiceCount">
@@ -46,7 +46,7 @@
         FROM
             tp_bill_invoice_count
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
             ORDER BY create_date desc LIMIT 7
     </select>
 
@@ -57,7 +57,7 @@
         FROM
             ta_user_license_count
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
             ORDER BY create_date desc LIMIT 7
     </select>
     <select id="getTemporaryLicenseCountList" resultType="com.huiju.estateagents.property.model.TaTemporaryLicenseCount">
@@ -67,7 +67,7 @@
         FROM
             ta_temporary_license_count
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
             ORDER BY create_date desc LIMIT 7
     </select>
 
@@ -77,7 +77,7 @@
         FROM
             ta_user_verify
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
         AND role_id = #{roleId}
     </select>
 
@@ -88,7 +88,7 @@
         FROM
             ta_brisk_user
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
             GROUP BY TO_DAYS(create_date)
             ORDER BY TO_DAYS(create_date)  desc limit 7
     </select>
@@ -99,7 +99,7 @@
         FROM
             tp_announcement
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
     </select>
 
     <select id="getActivityCount" resultType="java.lang.Integer">
@@ -108,7 +108,7 @@
         FROM
             tp_activity
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
     </select>
 
     <select id="getTopicCount" resultType="java.lang.Integer">
@@ -117,6 +117,6 @@
         FROM
             tp_transaction
         WHERE
-            community_id = #{orgId}
+            org_id = #{orgId}
     </select>
 </mapper>

src/main/resources/mapper/property/MessageMapper.xml

@@ -5,7 +5,7 @@
         SELECT
         id,
         ticket_id,
-        community_id,
+        org_id,
         message_type,
         advice_type,
         model_type,
@@ -91,7 +91,7 @@
         SELECT
         id,
         ticket_id,
-        community_id,
+        org_id,
         message_type,
         advice_type,
         model_type,

src/main/resources/mapper/property/SysRoleMapper.xml

@@ -4,7 +4,7 @@
     <select id="getRoleListByParams" resultType="com.huiju.estateagents.property.model.SysRole">
         SELECT
             t.id,
-            t.community_id as orgId,
+            t.org_id as orgId,
             t.role_name AS roleName,
             t.description,
             t.create_user AS createUser,
@@ -15,11 +15,11 @@
             uu.user_name as updateName
         FROM
             tp_sys_role t
-        LEFT JOIN tp_user u ON t.create_user = u.id AND u.community_id = #{role.orgId}
-        LEFT JOIN tp_user uu ON t.update_user = uu.id AND uu.community_id = #{role.orgId}
+        LEFT JOIN tp_user u ON t.create_user = u.id AND u.org_id = #{role.orgId}
+        LEFT JOIN tp_user uu ON t.update_user = uu.id AND uu.org_id = #{role.orgId}
         where
           1 = 1
-        AND t.community_id = #{role.orgId}
+        AND t.org_id = #{role.orgId}
         <if test="role.roleName != null and role.roleName != ''">
             and t.role_name like concat('%',#{role.roleName,jdbcType=VARCHAR},'%')
         </if>
@@ -28,6 +28,6 @@
     </select>
 
     <select id="selectByRoleName" resultType="com.huiju.estateagents.property.model.SysRole">
-        SELECT id,community_id,role_name,description from tp_sys_role where role_name = #{roleName,jdbcType=VARCHAR} and community_id = #{orgId}
+        SELECT id,org_id,role_name,description from tp_sys_role where role_name = #{roleName,jdbcType=VARCHAR} and org_id = #{orgId}
     </select>
 </mapper>

src/main/resources/mapper/property/SysRoleMenuMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.SysRoleMenuMapper">
 
     <insert id="insertList" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_sys_role_menu(community_id,role_id,menu_id)
+        insert into tp_sys_role_menu(org_id,role_id,menu_id)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.orgId},#{item.roleId},#{item.menuId})

src/main/resources/mapper/property/TaFaceMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectByPrimaryKey" resultType="com.huiju.estateagents.property.model.TaFace">
         select
-        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
+        id, org_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
         update_date
         from ta_face
         where id = #{id,jdbcType=INTEGER}
@@ -14,7 +14,7 @@
         where id = #{id,jdbcType=INTEGER}
     </delete>
     <insert id="insert" parameterType="com.huiju.estateagents.property.model.TaFace" >
-        insert into ta_face (id, community_id, ta_user_verify_id,face_img, create_user, create_date,
+        insert into ta_face (id, org_id, ta_user_verify_id,face_img, create_user, create_date,
         update_user, update_date)
         values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER},#{taUserVerifyId,jdbcType=INTEGER},#{faceImg,jdbcType=VARCHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
         #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
@@ -26,7 +26,7 @@
                 id,
             </if>
             <if test="orgId != null" >
-                community_id,
+                org_id,
             </if>
             <if test="taUserVerifyId != null" >
                 ta_user_verify_id,
@@ -78,7 +78,7 @@
         update ta_face
         <set >
             <if test="orgId != null" >
-                community_id = #{orgId,jdbcType=INTEGER},
+                org_id = #{orgId,jdbcType=INTEGER},
             </if>
             <if test="taUserVerifyId != null" >
                 ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
@@ -104,7 +104,7 @@
 
     <select id="getByUserVerifyId" resultType="com.huiju.estateagents.property.model.TaFace" parameterType="java.lang.Integer">
         select
-        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
+        id, org_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
         update_date
         from ta_face
         where ta_user_verify_id = #{userVerifyId,jdbcType=INTEGER}
@@ -112,7 +112,7 @@
 
     <select id="getById" resultType="com.huiju.estateagents.property.model.TaFace"  parameterType="java.lang.Integer" >
         select
-        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
+        id, org_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
         update_date
         from ta_face
         where id = #{id,jdbcType=INTEGER}

src/main/resources/mapper/property/TaSysMenuMapper.xml

@@ -5,7 +5,7 @@
     <select id="selectList" parameterType="integer" resultType="com.huiju.estateagents.property.model.TaSysMenu" >
         SELECT
             tas.id,
-            tas.community_id,
+            tas.org_id,
             tas.menu_name,
             tas.menu_url,
             tas.parent_id,
@@ -18,7 +18,7 @@
         FROM
             ta_sys_menu tas
         WHERE
-            tas.community_id = #{orgId}
+            tas.org_id = #{orgId}
         order by sort
     </select>
 

src/main/resources/mapper/property/TaTemporaryLicenseCountMapper.xml

@@ -5,12 +5,12 @@
     <select id="getTemporaryLicenseOrderPriceCount" resultType="map">
         SELECT
             sum( actual_amount ) AS totalPrice,
-            community_id AS orgId
+            org_id AS orgId
         FROM
             ta_temporary_license_order
         WHERE
             order_status = 1
         GROUP BY
-            community_id
+            org_id
     </select>
 </mapper>

src/main/resources/mapper/property/TaUserLicenseOrderMapper.xml

@@ -4,12 +4,12 @@
     <select id="getPriceCount" resultType="map">
         SELECT
             sum( extension_price ) AS totalPrice,
-            community_id AS orgId
+            org_id AS orgId
         FROM
             ta_user_license_order
         WHERE
             order_status = 1
         GROUP BY
-            community_id
+            org_id
     </select>
 </mapper>

src/main/resources/mapper/property/TaUserVerifyMapper.xml

@@ -2,6 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.TaUserVerifyMapper">
 
+    <sql id="Base_Column_List" >
+    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, remark
+  </sql>
+
     <select id="selectAllByPhoneAndUserNameAndIdCard" resultType="com.huiju.estateagents.property.model.TaUserVerify" >
         select
             tav.*,
@@ -24,7 +30,7 @@
                     and tu.id_card like CONCAT('%',#{idCard},'%')
                 </if>
                 <if test="orgId != null and orgId != ''">
-                    and tav.community_id = #{orgId,jdbcType=INTEGER}
+                    and tav.org_id = #{orgId,jdbcType=INTEGER}
                 </if>
             </trim>
         </where>
@@ -35,7 +41,7 @@
         select
         *
         from ta_user_verify
-        where community_id = #{orgId,jdbcType=INTEGER}
+        where org_id = #{orgId,jdbcType=INTEGER}
         and phase_id = #{phaseId,jdbcType=INTEGER}
         and building_id = #{buildingId,jdbcType=INTEGER}
         and unit_id = #{unitId,jdbcType=INTEGER}
@@ -49,7 +55,7 @@
         select
         *
         from ta_user_verify
-        where community_id = #{orgId,jdbcType=INTEGER}
+        where org_id = #{orgId,jdbcType=INTEGER}
         and phase_id = #{phaseId,jdbcType=INTEGER}
         and building_id = #{buildingId,jdbcType=INTEGER}
         and unit_id = #{unitId,jdbcType=INTEGER}
@@ -64,7 +70,23 @@
         select
           *
         from ta_user_verify
-        where community_id = #{orgId,jdbcType=INTEGER}
+        where org_id = #{orgId,jdbcType=INTEGER}
+        and user_id = #{userId,jdbcType=INTEGER}
+        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}
+        <if test="verifyStatus != null and verifyStatus != ''">
+            and verify_status = #{verifyStatus}
+        </if>
+    </select>
+
+    <select id="selectWxCommunityAndAddress" resultType="com.huiju.estateagents.property.model.TaUserVerify">
+        select
+        <include refid="Base_Column_List"/>
+        from ta_user_verify
+        where community_id = #{communityId,jdbcType=INTEGER}
         and user_id = #{userId,jdbcType=INTEGER}
         and phase_id = #{phaseId,jdbcType=INTEGER}
         and building_id = #{buildingId,jdbcType=INTEGER}

src/main/resources/mapper/property/ToCommunitiesMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.ToCommunitiesMapper">
 
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_building_owner_info(community_id,id_card, building,unit, `level`,
+        insert into tp_building_owner_info(org_id,id_card, building,unit, `level`,
         room_no,owner_name,owner_tel,gender,pair_status,verify_status,create_user,create_date,update_user,update_date)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -2,13 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.huiju.estateagents.property.dao.TpAnnouncementMapper" >
   <sql id="Base_Column_List" >
-    id, community_id, announcement_title, announcement_carousel_img, announcement_content,
+    id, org_id, announcement_title, announcement_carousel_img, announcement_content,
     sort, view_count, set_up_carousel, status, create_user, create_date, update_user,
     update_date
   </sql>
   <select id="getAnnouncements" resultType="com.huiju.estateagents.property.model.TpAnnouncement">
     SELECT
-    id, community_id, announcement_title, announcement_carousel_img, announcement_content,
+    id, org_id, announcement_title, announcement_carousel_img, announcement_content,
     sort, view_count, set_up_carousel, status, create_user, create_date, update_user,
     update_date
    FROM
@@ -20,24 +20,24 @@
         <if test="record.announcementTitle != null and record.announcementTitle != ''" >
           AND announcement_title like concat('%',#{record.announcementTitle,jdbcType=VARCHAR},'%')
         </if>
-          AND community_id = #{record.orgId,jdbcType=INTEGER}
+          AND org_id = #{record.orgId,jdbcType=INTEGER}
           ORDER BY sort DESC,create_date desc
       </where>
   </select>
   <select id="getById" resultType="com.huiju.estateagents.property.model.TpAnnouncement">
     SELECT
-    id, community_id, announcement_title, announcement_carousel_img, announcement_content,
+    id, org_id, announcement_title, announcement_carousel_img, announcement_content,
     sort, view_count, set_up_carousel, status, create_user, create_date, update_user,
     update_date
     FROM
     tp_announcement
-    WHERE community_id = #{record.orgId,jdbcType=INTEGER}
+    WHERE org_id = #{record.orgId,jdbcType=INTEGER}
   </select>
   <update id="updateTpAnnouncement" parameterType="com.huiju.estateagents.property.model.TpAnnouncement" >
     update tp_announcement
     <set >
       <if test="orgId != null" >
-        community_id = #{orgId,jdbcType=INTEGER},
+        org_id = #{orgId,jdbcType=INTEGER},
       </if>
       <if test="announcementTitle != null" >
         announcement_title = #{announcementTitle,jdbcType=VARCHAR},

src/main/resources/mapper/property/TpBuildingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.huiju.estateagents.property.dao.TpBuildingMapper" >
   <sql id="Base_Column_List" >
-    id, community_id, phase, building, unit, `level`, room_no, create_date
+    id, org_id, phase, building, unit, `level`, room_no, create_date
   </sql>
   <select id="buildinglist" resultType="com.huiju.estateagents.property.model.TpBuilding">
     select

src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml

@@ -31,13 +31,13 @@
             <if test="VerifyStatus == null or VerifyStatus == ''" >
                 and	(verify_status = 1 or verify_status = 2)
             </if>
-            and community_id=#{CommunityId,jdbcType=INTEGER}
+            and org_id=#{orgId,jdbcType=INTEGER}
             order by create_date desc
         </where>
     </select>
 
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_building_owner_info(community_id,id_card, phase, building,unit, `level`,
+        insert into tp_building_owner_info(org_id,id_card, phase, building,unit, `level`,
         room_no,owner_name,owner_tel,gender,pair_status,verify_status,create_user,create_date,update_user,update_date)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
@@ -67,7 +67,7 @@
             u.level_name,
             u.room_no_name,
             u.id AS userVerifyId,
-            u.community_id AS orgId,
+            u.org_id AS orgId,
             t.login_name AS ownerTel,
             t.user_name AS ownerName,
             t.id_card AS idCard,
@@ -81,7 +81,7 @@
             LEFT JOIN ta_sys_role r ON u.role_id = r.id
         WHERE
 
-        u.community_id=#{tpBuildingOwnerInfo.orgId,jdbcType=INTEGER}
+        u.org_id=#{tpBuildingOwnerInfo.orgId,jdbcType=INTEGER}
         <if test="tpBuildingOwnerInfo.phaseId != null and tpBuildingOwnerInfo.phaseId != ''">
             and u.phase_id = #{tpBuildingOwnerInfo.phaseId,jdbcType=INTEGER}
         </if>

src/main/resources/mapper/property/TpHotelImgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.TpHotelImgMapper">
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_hotel_img(community_id,hotel_id,img_url,img_type,create_date)
+        insert into tp_hotel_img(org_id,hotel_id,img_url,img_type,create_date)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.orgId},#{item.hotelId},#{item.imgUrl},#{item.imgType},#{item.createDate})

src/main/resources/mapper/property/TpRentalHouseImgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.TpRentalHouseImgMapper">
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_rental_house_img(community_id,rental_house_id,img_url,img_type,create_date)
+        insert into tp_rental_house_img(org_id,rental_house_id,img_url,img_type,create_date)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.orgId},#{item.rentalHouseId},#{item.imgUrl},#{item.imgType},#{item.createDate})

src/main/resources/mapper/property/TpRentalHouseMapper.xml

@@ -17,7 +17,7 @@
             tp_rental_house t
         LEFT JOIN tp_user u ON t.update_user = u.id
         where 1=1
-        and t.community_id = #{tpRentalHouse.orgId}
+        and t.org_id = #{tpRentalHouse.orgId}
         <if test="tpRentalHouse.id != null and tpRentalHouse.id != ''">
             and t.id like concat('%',#{tpRentalHouse.id},'%')
         </if>

src/main/resources/mapper/property/TpShopImgMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.TpShopImgMapper">
 
     <insert id="batchSave" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_shop_img(community_id,shop_id,img_url,img_type,create_date)
+        insert into tp_shop_img(org_id,shop_id,img_url,img_type,create_date)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.orgId},#{item.shopId},#{item.imgUrl},#{item.imgType},#{item.createDate})

src/main/resources/mapper/property/TpShopMapper.xml

@@ -20,7 +20,7 @@
             LEFT JOIN  tp_shop_type s on t.shop_type_id = s.id
             LEFT JOIN tp_user u on t.update_user = u.id
         where 1=1
-        and t.community_id = #{tpShop.orgId}
+        and t.org_id = #{tpShop.orgId}
         <if test="tpShop.id != null and tpShop.id != ''">
             and t.id like concat('%',#{tpShop.id},'%')
         </if>

src/main/resources/mapper/property/TpShopTypeMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.TpShopTypeMapper">
 
     <insert id="insertBatchIds" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
-        insert into tp_shop_type(community_id,type_name,sort,source,create_date,create_user)
+        insert into tp_shop_type(org_id,type_name,sort,source,create_date,create_user)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.orgId},#{item.typeName},#{item.sort},#{item.source},#{item.createDate},#{item.createUser})

src/main/resources/mapper/property/TpSysRoleMapper.xml

@@ -15,6 +15,6 @@
     id
     FROM
     tp_sys_role
-    WHERE community_id=#{orgId,jdbcType=INTEGER}
+    WHERE org_id=#{orgId,jdbcType=INTEGER}
     </select>
 </mapper>

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -4,7 +4,7 @@
     <select id="ticketList" resultType="com.huiju.estateagents.property.model.TpTicket">
     SELECT
     p.id,
-    p.community_id,
+    p.org_id,
     p.ta_user_id,
     p.ticket_title,
     p.ticket_content,
@@ -42,7 +42,7 @@
     <if test="updateUserNmae != null and updateUserNmae !=''">
         and u.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
     </if>
-    and p.community_id=#{orgId,jdbcType=INTEGER}
+    and p.org_id=#{orgId,jdbcType=INTEGER}
 </where>
         order by  create_date desc
     </select>
@@ -50,7 +50,7 @@
     <select id="ticketDetails" resultType="com.huiju.estateagents.property.vo.TpTicketVO">
         SELECT
         p.id,
-        p.community_id,
+        p.org_id,
         p.ta_user_id,
         p.ticket_title,
         p.ticket_content,

src/main/resources/mapper/property/TpTicketRecordMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.TpTicketRecordMapper">
 <select id="selectTpTicketRecord" resultType="com.huiju.estateagents.property.model.TpTicketRecord">
     SELECT
-    id, community_id, ticket_id, content, status, create_user, create_date
+    id, org_id, ticket_id, content, status, create_user, create_date
     FROM tp_ticket_record
     WHERE ticket_id = #{ticketId,jdbcType=INTEGER}
           and status = #{status,jdbcType=INTEGER}
@@ -12,7 +12,7 @@
         update tp_ticket_record
         <set >
             <if test="orgId != null" >
-                community_id = #{orgId,jdbcType=INTEGER},
+                org_id = #{orgId,jdbcType=INTEGER},
             </if>
             <if test="ticketId != null" >
                 ticket_id = #{ticketId,jdbcType=INTEGER},

src/main/resources/mapper/property/TpTransactionMapper.xml

@@ -4,7 +4,7 @@
     <select id="selectListByParams" resultType="com.huiju.estateagents.property.model.TpTransaction">
         SELECT
         t.id,
-        t.community_id AS orgId,
+        t.org_id AS orgId,
         t.transaction_title AS transactionTitle,
         t.view_count AS viewCount,
         t.`status`,
@@ -20,7 +20,7 @@
         LEFT JOIN tp_transaction_like li ON t.id = li.transaction_id
         AND li.like_status = 1
         LEFT JOIN tp_transaction_reply re ON t.id = re.transaction_id
-        WHERE t.community_id =#{orgId}
+        WHERE t.org_id =#{orgId}
         <if test="id != null and id != '' or id ==0">
             and t.id like concat('%',#{id},'%')
         </if>

src/main/resources/mapper/property/TransactionReplyMapper.xml

@@ -4,7 +4,7 @@
     <select id="transactionReplyList" resultType="com.huiju.estateagents.property.model.TransactionReply">
     SELECT
         re.id,
-        re.community_id,
+        re.org_id,
         re.transaction_id,
         re.uuid_name,
         re.reply_content,

src/main/resources/mapper/property/UserMapper.xml

@@ -28,7 +28,7 @@
             <if test="userName != null and userName !=''" >
                 and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
             </if>
-            and  tu.community_id=#{orgId,jdbcType=INTEGER}
+            and  tu.org_id=#{orgId,jdbcType=INTEGER}
         </where>
         order by  tu.create_date desc
     </select>
@@ -111,11 +111,11 @@
             r.parent_id
         FROM
             tp_sys_user_role t
-            LEFT JOIN tp_sys_role_menu m ON t.role_id = m.role_id AND m.community_id = #{orgId}
+            LEFT JOIN tp_sys_role_menu m ON t.role_id = m.role_id AND m.org_id = #{orgId}
             LEFT JOIN tp_sys_menu r on m.menu_id = r.id and r.status = 0
         WHERE
             t.user_id = #{userId}
-            AND t.community_id = #{orgId}
+            AND t.org_id = #{orgId}
         GROUP BY r.id
     </select>
 
@@ -140,7 +140,7 @@
         tu.id
         FROM
          tp_user tu
-        WHERE   tu.community_id=#{orgId,jdbcType=INTEGER}
+        WHERE   tu.org_id=#{orgId,jdbcType=INTEGER}
         and tu.id!=#{id,jdbcType=INTEGER}
     </select>
 </mapper>