提交

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

@@ -833,6 +833,9 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        user.setUserVerifyId(userElement.getUserVerifyId());
+        user.setCommunityId(userElement.getCommunityId());
+
         // 查询 家属或者租客
         if (null != userId) {
             TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
@@ -842,11 +845,12 @@ public class TaUserServiceImpl implements ITaUserService {
                 return response;
             }
             TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
+            todUser.setUserVerifyId(todUserVerify.getId());
+            todUser.setCommunityId(todUserVerify.getCommunityId());
             user = todUser;
         }
 
-        user.setUserVerifyId(userElement.getUserVerifyId());
-        user.setCommunityId(userElement.getCommunityId());
+
         TaUserVO userVO = new TaUserVO();
 
         // 根据用户id, 获取 用户的住址, 人脸是否认证, 角色
@@ -867,6 +871,9 @@ public class TaUserServiceImpl implements ITaUserService {
 
         BeanTools.copyProperties(user, userVO);
 
+        // 房产状态
+        userVO.setVerifyStatus(user.getVerifyStatus());
+
         // 默认未绑定微信
         userVO.setBindingWX(Constant.NO_BINDING_WX);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -34,7 +34,7 @@ public class TaUserVO {
     /** 性别 **/
     private String gender;
 
-    /** 认证状态 **/
+    /** 房产认证状态 **/
     private String verifyStatus;
 
     /** 角色 **/

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserVerifyController.java

@@ -1,9 +1,16 @@
 package com.community.huiju.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserVerify;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.community.huiju.service.ITaUserService;
 import com.community.huiju.service.ITaUserVerifyService;
+import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -13,6 +20,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.util.Map;
 
 @RestController
 @RefreshScope
@@ -23,6 +31,12 @@ public class UserVerifyController extends BaseController {
     @Autowired
     private ITaUserVerifyService iTaUserVerifyService;
 
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @Autowired
+    private IBuildingOwnerInfoService iBuildingOwnerInfoService;
+
     @RequestMapping(value = "/user/verify/all", method = RequestMethod.GET)
     @ApiOperation(value = "获取待审核的用户列表", notes = "获取待审核的用户列表")
     @ApiImplicitParams({
@@ -60,4 +74,49 @@ public class UserVerifyController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/ta/user/has", method = RequestMethod.GET)
+    @ApiOperation(value = "校验移动端手机号是否注册以及业主", notes = "校验移动端手机号是否注册以及业主")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "ownerTel", value = "审核id"),
+    })
+    public ResponseBean getAll(@RequestParam("ownerTel") String ownerTel,
+                               @RequestParam("phaseId") Integer phaseId,
+                               @RequestParam("buildingId")Integer buildingId,
+                               @RequestParam("unitId")Integer unitId,
+                               @RequestParam("levelId")Integer levelId,
+                               @RequestParam("roomNoId")Integer roomNoId,
+                               HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("login_name", ownerTel);
+        TaUser user = iTaUserService.getOne(queryWrapper);
+        if (null == user) {
+            responseBean.addError("未注册");
+            return responseBean;
+        }
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("info", user);
+        // true 标识业主 false 非业主
+        map.put("boolRole", false);
+
+        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
+        buildingOwnerInfoQueryWrapper.eq("phase_id", phaseId);
+        buildingOwnerInfoQueryWrapper.eq("building_id", buildingId);
+        buildingOwnerInfoQueryWrapper.eq("unit_id", unitId);
+        buildingOwnerInfoQueryWrapper.eq("level_id", levelId);
+        buildingOwnerInfoQueryWrapper.eq("room_no_id", roomNoId);
+        buildingOwnerInfoQueryWrapper.eq("owner_tel", ownerTel);
+        TpBuildingOwnerInfo buildingOwnerInfo = iBuildingOwnerInfoService.getOne(buildingOwnerInfoQueryWrapper);
+        if (null == buildingOwnerInfo) {
+            map.put("boolRole", true);
+        }
+
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -130,5 +130,9 @@ public class TaUser implements Serializable {
      */
     private String faceStatus;
 
+    /**
+     * 身份证号
+     */
+    private String idCard;
 
 }

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

@@ -65,7 +65,7 @@
             t.owner_tel as ownerTel,
             t.owner_name as ownerName,
             t.id_card as idCard,
-            r.role_name as roleName,
+            r.description as roleName,
             u.verify_status as verifyStatus,
             m.user_name AS updateName,
             t.update_date as updateDate

VUECODE/smart-property-manage/src/api/user.js

@@ -106,3 +106,19 @@ export function userVerifyAudit(data) {
   })
 }
 
+// 校验移动端手机号是否注册以及业主
+export function taUserHas(data) {
+  return request({
+    url: '/ta/user/has',
+    method: 'get',
+    params: {
+      ownerTel: data.ownerTel,
+      phaseId: data.phaseId,
+      buildingId: data.buildingId,
+      unitId: data.unitId,
+      levelId: data.levelId,
+      roomNoId: data.roomNoId
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logOut, getInfo, sendCode, getPermission } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, userVerifyAll, userVerifyAudit } from '@/api/user'
+import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, userVerifyAll, userVerifyAudit, taUserHas } from '@/api/user'
 
 const user = {
   state: {
@@ -192,6 +192,15 @@ const user = {
           reject(error)
         })
       })
+    },
+    TaUserHas({ commit }, data) { // 校验移动端手机号是否注册以及业主
+      return new Promise((resolve, reject) => {
+        taUserHas(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -1,27 +1,83 @@
 <template>
   <div class="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
-      <el-form-item label="期/区" prop="phase">
-        <el-input v-model="ruleForm.phase"/>
+    <el-form ref="ruleForm" :model="listQuery" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="期/区" prop="phaseId">
+        <el-select v-model="listQuery.phaseId" placeholder="期/区" @change="buildSelectChange(0)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in phaseList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
       </el-form-item>
-      <el-form-item label="栋" prop="building">
-        <el-input v-model="ruleForm.building"/>
+      <el-form-item label="栋" prop="buildingId">
+        <el-select v-model="listQuery.buildingId" placeholder="栋" @change="buildSelectChange(1)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in buildingList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
       </el-form-item>
-      <el-form-item label="单元" prop="unit">
-        <el-input v-model="ruleForm.unit"/>
+      <el-form-item label="单元" prop="unitId">
+        <el-select v-model="listQuery.unitId" placeholder="单元" @change="buildSelectChange(2)">
+          <!--<el-option label="选择单元" value="-1" />-->
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
       </el-form-item>
-      <el-form-item label="楼层" prop="level">
-        <el-input v-model="ruleForm.level"/>
+      <el-form-item label="楼层" prop="levelId">
+        <el-select v-model="listQuery.levelId" placeholder="楼层" @change="buildSelectChange(3)">
+          <!--<el-option label="选择楼层" value="-1" />-->
+          <el-option
+            v-for="item in levelList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
       </el-form-item>
-      <el-form-item label="户号" prop="roomNo">
-        <el-input v-model="ruleForm.roomNo"/>
+      <el-form-item label="户号" prop="roomNoId">
+        <el-select v-model="listQuery.roomNoId" placeholder="户号">
+          <!--<el-option label="选择户号" value="-1" />-->
+          <el-option
+            v-for="item in roomNoList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
       </el-form-item>
-      <el-form-item label="业主姓名" prop="ownerName">
-        <el-input v-model="ruleForm.ownerName"/>
+      <el-form-item label="手机号" prop="ownerTel" placeholder="手机号">
+        <el-input v-model="listQuery.ownerTel" @blur="taUserHas('ruleForm')"/>
       </el-form-item>
-      <el-form-item label="业主手机号" prop="ownerTel">
-        <el-input v-model="ruleForm.ownerTel"/>
+      <el-form-item label="身份" prop="roleId">
+        <el-select v-model="listQuery.roleId" placeholder="身份">
+          <el-option :disabled="roleDisabled" label="业主" value="1" />
+          <el-option label="租客" value="2" />
+          <el-option label="家属" value="3" />
+        </el-select>
       </el-form-item>
+      <el-form-item v-if="isRegistered" label="姓名" placeholder="姓名">
+        <el-input v-model="listQuery.ownerName"/>
+      </el-form-item>
+      <div v-else>
+        <el-form-item label="注册状态：" >
+          <span style="margin-left: 100px;">已注册</span>
+        </el-form-item>
+        <el-form-item label="姓名：" >
+          <span style="margin-left: 100px;">{{ userName }}</span>
+        </el-form-item>
+        <el-form-item label="性别：" >
+          <span style="margin-left: 100px;">{{ gender }}</span>
+        </el-form-item>
+        <el-form-item label="身份证号：" >
+          <span style="margin-left: 100px;">{{ idCard }}</span>
+        </el-form-item>
+      </div>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
@@ -34,29 +90,40 @@
 export default {
   data() {
     return {
-      ruleForm: {
-        phase: '',
-        building: '',
-        unit: '',
-        level: '',
-        roomNo: '',
+      listQuery: {
+        phaseId: '',
+        buildingId: '',
+        unitId: '',
+        levelId: '',
+        roomNoId: '',
         ownerName: '',
-        ownerTel: ''
+        ownerTel: '',
+        roleId: ''
       },
+      isRegistered: true, // true 未注册 false 注册
+      roleDisabled: false, // 是否禁用业主下拉选项
+      phaseList: [], // 期 集合
+      buildingList: [], // seletc 楼栋集合
+      unitList: [], // seletc 单元集合
+      levelList: [], // seletc 层 集合
+      roomNoList: [], //  seletc 户号集合
+      userName: '', // 用户姓名
+      gender: '', // 性别
+      idCard: '', // 身份证
       rules: {
-        phase: [
+        phaseId: [
           { required: true, message: '请输入期/区', trigger: 'blur' }
         ],
-        building: [
+        buildingId: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],
-        unit: [
+        unitId: [
           { required: true, message: '请输入单元', trigger: 'blur' }
         ],
-        level: [
+        levelId: [
           { required: true, message: '请输入楼层', trigger: 'blur' }
         ],
-        roomNo: [
+        roomNoId: [
           { required: true, message: '请输入户号', trigger: 'blur' }
         ],
         ownerName: [
@@ -65,10 +132,14 @@ export default {
         ownerTel: [
           { required: true, message: '请输入手机号', trigger: 'blur' },
           { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
-        ],
+        ]
       }
     }
   },
+  mounted() {
+    // 获取期
+    this.getPhase()
+  },
   methods: {
     submitForm(formName) { // 提交
       this.$refs[formName].validate((valid) => {
@@ -81,6 +152,12 @@ export default {
       })
     },
     resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非业主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
       this.$refs[formName].resetFields()
     },
     addBuilding() {
@@ -107,6 +184,113 @@ export default {
         loading.close()
         console.log('error AddBuilding')
       })
+    },
+    getPhase() { // 获取期
+      this.listQuery.phaseId = ''
+      this.$store.dispatch('GetPhaseList', this.listQuery).then((res) => {
+        this.phaseList = res.data
+      }).catch(() => {
+        console.log('error phase BuildingAddress')
+      })
+    },
+    getBuild() { // 获取楼栋
+      this.listQuery.buildingId = ''
+      this.$store.dispatch('GetBuildingList', this.listQuery).then((res) => {
+        this.buildingList = res.data
+      }).catch(() => {
+        console.log('error building BuildingAddress')
+      })
+    },
+    getUnit() { // 获取单元
+      this.listQuery.unitId = ''
+      this.$store.dispatch('GetUnitList', this.listQuery).then((res) => {
+        this.unitList = res.data
+      }).catch(() => {
+        console.log('error unit BuildingAddress')
+      })
+    },
+    getLevel() { // 获取楼层
+      this.listQuery.levelId = ''
+      this.$store.dispatch('GetLevelList', this.listQuery).then((res) => {
+        this.levelList = res.data
+      }).catch(() => {
+        console.log('error level BuildingAddress')
+      })
+    },
+    getRoomNo() { // 获取户号
+      this.listQuery.roomNoId = ''
+      this.$store.dispatch('GetRoomNoList', this.listQuery).then((res) => {
+        this.roomNoList = res.data
+      }).catch(() => {
+        console.log('error roomNo BuildingAddress')
+      })
+    },
+    buildSelectChange(value) { // select 的 change
+      switch (value) {
+        case 0: // 查询栋
+          this.buildingList = []
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.buildingId = ''
+          this.listQuery.unitId = ''
+          this.listQuery.levelId = ''
+          this.listQuery.roomNoId = ''
+          this.getBuild()
+          break
+        case 1: // 查询 单元
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.unitId = ''
+          this.listQuery.levelId = ''
+          this.listQuery.roomNoId = ''
+          this.getUnit()
+          break
+        case 2: // 查询 楼层
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.levelId = ''
+          this.listQuery.roomNoId = ''
+          this.getLevel()
+          break
+        case 3: // 查询 户号
+          this.roomNoList = []
+          this.listQuery.roomNoId = ''
+          this.getRoomNo()
+          break
+      }
+    },
+    taUserHas(formName) { // 校验移动端手机号是否注册以及业主
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('TaUserHas', this.listQuery).then((res) => {
+            const resCode = res.code
+            if (resCode === '1') {
+              // 未注册
+              this.isRegistered = true
+              return
+            }
+            // 已经注册
+            this.isRegistered = false
+            const resData = res.data
+            if (resData.boolRole === true) {
+              // 表示已经是业主
+              this.roleDisabled = true
+            }
+            // 展示注册信息
+            const resInfo = resData.info
+            this.userName = resInfo.userName
+            this.idCard = resInfo.idCard
+            this.gender = resInfo.gender === '1' ? '男' : '女'
+          }).catch(() => {
+            console.log('TaUserHas error')
+          })
+        } else {
+          console.log('error 校验号码')
+          return false
+        }
+      })
     }
   }
 }

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

@@ -356,6 +356,9 @@ export default {
       })
     },
     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
       var value = new Date(val)
       var year = value.getFullYear()
       var month = value.getMonth() + 1
@@ -365,6 +368,22 @@ export default {
       // var seconds = value.getSeconds()
       // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
+    },
+    showRoleName(roleId) {
+      let str = ''
+      switch (roleId) {
+        case 1:
+          str = '业主'
+          break
+        case 2:
+          str = '租客'
+          break
+        case 3:
+          str = '家属'
+          break
+      }
+
+      return str
     }
   }
 }