合并

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

@@ -324,4 +324,14 @@ public class BuildingOwnerInfoController extends BaseController {
             e.printStackTrace();
         }
     }
+    @ApiOperation(value = "住户资料详情",nickname ="住户资料详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:楼栋住户ID"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+    @RequestMapping(value="/building/details",method = RequestMethod.POST)
+    public ResponseBean buildingDetails(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean buildinglist=iBuildingOwnerInfoService.buildingDetails(paramets,userElement);
+        return buildinglist;
+    }
 }

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

@@ -152,4 +152,22 @@ public class UserVerifyController extends BaseController {
         return map;
     }
 
+    @RequestMapping(value = "/user/verifyinfo/{userVerifyId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "楼栋详情页面审核", notes = "楼栋详情页面审核")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "roleState", value = "1:业主，2:租客，3:家属"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "verifyStatus", value = "0 是未审核1是审核通过2是审核不通过"),
+    })
+    public ResponseBean verifyinfoAdd(@PathVariable("userVerifyId") Integer userVerifyId,
+                               @RequestParam("verifyStatus") String verifyStatus,
+                               @RequestParam("roleState") String roleState,
+                               HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserVerifyService.verifyinfoAdd(userElement, userVerifyId, verifyStatus, roleState);
+        return responseBean;
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
@@ -148,4 +149,9 @@ public class TaUser implements Serializable {
      */
     private String nickname;
 
+    /**
+     * 身份
+     */
+    @TableField(exist = false)
+    private String description;
 }

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

@@ -139,4 +139,11 @@ public class TaUserVerify implements Serializable {
     @TableField(exist = false)
     private String gender;
 
+    /**
+     * 人脸图片
+     */
+    @TableField(exist = false)
+    private String faceImg;
+
+
 }

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

@@ -149,4 +149,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean getRoomNoList(Integer levelId, Integer communityId);
+
+    /**
+     * 查看住户详情
+     * @param paramets
+     * @param userElement
+     * @return
+     */
+    ResponseBean buildingDetails(String paramets, UserElement userElement);
 }

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

@@ -30,4 +30,13 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      */
     ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus);
 
+    /**
+     * 楼栋详情页面审核审核
+     * @param userElement
+     * @param userVerifyId
+     * @param verifyStatus
+     * @return
+     */
+    ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus ,String roleState);
+
 }

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

@@ -98,6 +98,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private TaUserFeignService taUserFeignService;
 
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+    @Autowired
+    private TaFaceMapper taFaceMapper;
 
     @Autowired
     @Qualifier("phoneCodeImpl")
@@ -1012,4 +1017,50 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     
         return responseBean;
     }
+
+    @Override
+    public ResponseBean buildingDetails(String paramets, UserElement userElement) {
+        ResponseBean response= new ResponseBean();
+        JSONObject object= JSONObject.parseObject(paramets);
+        Integer id= object.getInteger("id");
+
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectById(id);
+        //根据当前userid查询ta_user
+        TaUser  taUser= taUserMapper.selectById(taUserVerify.getUserId());
+        //查询当前的身份
+        String description= taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription();
+        taUser.setDescription(description);
+
+        //查询人脸
+        QueryWrapper<TaFace> taFace= new QueryWrapper<>();
+        taFace.eq("community_id",taUserVerify.getCommunityId());
+        taFace.eq("ta_user_verify_id",id);
+        TaFace face= taFaceMapper.selectOne(taFace);
+        if(null!=face) {
+            taUserVerify.setFaceImg(face.getFaceImg());
+        }
+        // 查询多套关联房产
+        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper= new QueryWrapper<>();
+        taUserVerifyQueryWrapper.eq("user_id",taUser.getId());
+        taUserVerifyQueryWrapper.eq("verify_status",1);
+        List<TaUserVerify> taUserVerifyList= taUserVerifyMapper.selectList(taUserVerifyQueryWrapper);
+        List<String> roomInfoList= new ArrayList<>();
+        for (TaUserVerify roomInfo:taUserVerifyList){
+            //组装-期/楼栋/单元/楼层/户号
+            roomInfoList.add(roomInfo.getPhaseName()
+            +roomInfo.getBuildingName()
+            +roomInfo.getUnitName()
+            +roomInfo.getLevelName()
+            +roomInfo.getRoomNoName());
+        }
+        Map<String, Object> map = Maps.newHashMap();
+        /*当前房产信息*/
+        map.put("taUserVerify",taUserVerify);
+        /*个人信息*/
+        map.put("taUser",taUser);
+        /*房屋列表*/
+        map.put("roomInfoList",roomInfoList);
+        response.addSuccess(map);
+        return response;
+    }
 }

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

@@ -7,18 +7,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.MessageMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TaUserVerifyMapper;
-import com.community.huiju.dao.UserMapper;
-import com.community.huiju.model.Message;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TaUserVerify;
-import com.community.huiju.model.User;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserVerifyService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -38,6 +33,12 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
     @Override
     public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -71,6 +72,40 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
         userVerify.setVerifyStatus(status);
         userVerify.setVerifyName(user.getUserName());
+        taUserVerifyMapper.updateById(userVerify);
+        responseBean.addSuccess("操作成功！");
+
+        return responseBean;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus, String roleState) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError("审核数据不存在！");
+            return responseBean;
+        }
+        // 审核通过的情况
+        if ("1".equals(verifyStatus)&&!"".equals(roleState)){
+            userVerify.setRoleId(Integer.valueOf(roleState));
+            taUserVerifyMapper.updateById(userVerify);
+        }
+        if (!"".equals(verifyStatus)&&!"".equals(roleState)){
+            userVerify.setVerifyStatus(verifyStatus);
+            userVerify.setRoleId(Integer.valueOf(roleState));
+            taUserVerifyMapper.updateById(userVerify);
+        }
+
+        // 审核成功后更新building_owner_info里面的时间
+//        Integer BuildingID= taUserMapper.selectById(userVerify.getUserId()).getBuildingOwnerInfoId();
+//        TpBuildingOwnerInfo tpBuildingOwnerInfo= tpBuildingOwnerInfoMapper.selectById(BuildingID);
+//         LocalDateTime time = LocalDateTime.now();
+//         tpBuildingOwnerInfo.setUpdateDate(time);
+//        tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
+
         responseBean.addSuccess("操作成功！");
 
         return responseBean;

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

@@ -102,5 +102,6 @@
         <if test="tpBuildingOwnerInfo.idCard != null and tpBuildingOwnerInfo.idCard != ''">
             and t.id_card like concat('%',#{tpBuildingOwnerInfo.idCard,jdbcType=VARCHAR},'%')
         </if>
+        order by t.update_date desc
     </select>
 </mapper>

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

@@ -230,3 +230,24 @@ export function deleteNode(data) {
     }
   })
 }
+// 查新楼栋信息详情
+export function buildingDetails(data) {
+  return request({
+    url: '/building/details',
+    method: 'post',
+    data: {
+      id: data.userVerifyId
+    }
+  })
+}
+// 楼栋详情审核用户
+export function verifyinfoAdd(data) {
+  return request({
+    url: '/user/verifyinfo/' + data.userVerifyId,
+    method: 'put',
+    params: {
+      verifyStatus: data.verifyStatus,
+      roleState: data.type
+    }
+  })
+}

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

@@ -101,7 +101,8 @@ export function userVerifyAudit(data) {
     url: '/user/verify/audit/' + data.userVerifyId,
     method: 'put',
     params: {
-      verifyStatus: data.verifyStatus
+      verifyStatus: data.verifyStatus,
+      roleState: data.type
     }
   })
 }

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

@@ -1,5 +1,5 @@
 
-import { getPhaseList, getBuildingList, getUnitList, buildingList, getLevelList, getRoomNoList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel, addNode, deleteNode } from '@/api/buildingOwnerInfo'
+import { getPhaseList, getBuildingList, getUnitList, buildingList, getLevelList, getRoomNoList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel, addNode, deleteNode, buildingDetails, verifyinfoAdd } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {
@@ -180,6 +180,24 @@ const buildingOwnerInfo = {
           reject(error)
         })
       })
+    },
+    BuildingDetails({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        buildingDetails(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    VerifyinfoAdd({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        verifyinfoAdd(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -77,8 +77,9 @@
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column prop="userVerifyId" label="编号" align="center" />
       <el-table-column prop="ownerName" label="姓名" align="center">
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.ownerName }}</span></a></template>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.userVerifyId)">{{ scope.row.ownerName }}</span></a></template>
       </el-table-column>
       <el-table-column prop="ownerTel" label="手机号" align="center" />
       <el-table-column prop="idCard" label="身份证号" align="center" />

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

@@ -6,29 +6,85 @@
         <el-form-item>
           <table>
             <tr>
-              <td>姓名</td>
-              <td>张三</td>
+              <td >姓名</td>
+              <td style="color:#888888">{{ listQuery.userName }}</td>
               <td>性别</td>
-              <td>男</td>
+              <td style="color:#888888">{{listQuery.gender=='1'?'男':'女'}}</td>
               <td>手机号</td>
-              <td>15871301059</td>
+              <td style="color:#888888">{{ listQuery.loginName }}</td>
             </tr>
             <tr>
               <td>微信昵称</td>
-              <td>张三</td>
+              <td style="color:#888888">{{ listQuery.nickname }}</td>
               <td>微信ID</td>
-              <td>男</td>
+              <td style="color:#888888">{{ listQuery.openid }}</td>
               <td>身份证</td>
-              <td>15871301059</td>
+              <td style="color:#888888">{{ listQuery.idCard }}</td>
             </tr>
             <tr>
               <td>头像</td>
-              <td colspan="5">张三</td>
+              <td v-if="listQuery.headPortrait !=null"><img  :src="listQuery.headPortrait" preview  width="150" height="120"  style="margin:5px;"></td>
             </tr>
           </table>
+     
         </el-form-item>
-        <el-form-item label="在当前房屋"/>
-        <el-form-item label="关联本小区其他房屋"/>
+        <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>  
+        <el-form-item label="在当前房屋">
+            <table style="transform:translateY(20%);">
+            <tr>
+              <td>身份</td>
+              <td style="color:#888888" v-if="listQuery.off=='1'">{{ listQuery.description }}</td>
+              <td v-if="listQuery.off=='2'">
+                <el-select v-model="listQuery.type" placeholder="请选择">
+                  <el-option label="选择状态" value="" />
+                  <el-option label="业主" value="1"/>
+                  <el-option label="租客" value="2"/>
+                  <el-option label="家属" value="3"/>
+                </el-select>
+              </td>
+              <td>审核状态</td>                  
+              <td v-if="listQuery.verifyStatus=='1'">{{ '审核通过' }}   <td>
+              <td v-if="listQuery.verifyStatus=='2' && listQuery.off=='1' "><font color="red">{{ '审核未通过' }}</font><td>
+              <td v-if="listQuery.verifyStatus=='0' && listQuery.off=='1' "><font color="red">{{ '未审核' }}</font><td>    
+              <td v-if="listQuery.off=='2' && listQuery.verifyStatus !='1'">
+                <el-select v-model="listQuery.passType" placeholder="请选择">
+                  <el-option label="选择状态" value="" />
+                  <el-option label="通过" value="1"/>
+                  <el-option label="不通过" value="2"/>
+                </el-select>
+              </td>
+              <td>资料手机</td>
+              <td style="color:#888888">{{ listQuery.loginName }}</td>
+              <td v-if="listQuery.off=='1'"><el-button round  @click="offEnd()">修改</el-button></td>
+              <td v-if="listQuery.off=='2'"><el-button type="primary" round v-model="listQuery.off" :label="2" @click="userVerifyAudit">提交</el-button></td>
+            </tr>
+            <tr>
+              <td>人脸</td>
+               <td v-if="listQuery.faceImg !=null"><img  :src="listQuery.faceImg" preview  width="150" height="120"  style="margin:5px;"></td>
+            </tr>          
+          </table>
+        </el-form-item>
+        <div>
+         <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>     
+         <div style="transform:translateY(120%);"><span>关联本小区其他房屋</span></div> 
+         <el-form-item>
+          <table >
+            <tr style="transform:translateY(-10%);">
+              <td style="color:#A9A9A9">&emsp;&emsp;&emsp;&emsp;使用用户手机号在小区用户列表中搜索查看</td>           
+            </tr>
+            <tr style="transform:translateY(38%);">
+              
+              <td  v-for="room of listQuery.roomInfoList" style="color:#888888">{{room}}</td><br>           
+            </tr>
+  
+          </table>
+         </el-form-item>
+        <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>
+        </div>
+        <span style="color:#A9A9A9">
+        若想修改业主登录手机号，需要业主自己登录APP在个人中心修改。或者联系荟房网络运营人员核实后修改，因为此手机号可能在其他社区在用。
+        若想修改成员为其他成员的手机号，请删除此成员后添加新成员。
+        </span>  
       </el-form>
     </div>
   </div>
@@ -36,8 +92,77 @@
 
 <script>
 export default {
-  name: 'InfoIndex'
+  data() {
+    return {
+      listQuery: {
+        userVerifyId: '',
+        userName: '',
+        gender: '',
+        loginName: '',
+        nickname: '',
+        openid: '',
+        idCard: '',
+        headPortrait: '',
+        description: '',
+        verifyStatus: '',
+        faceImg: '',
+        roomInfoList: '',
+        off: '1', // 控制按钮的展示
+        type: '',
+        passType: '',   
+      },
+      total: 0, // 数据总数
+      
+    }
+  },
+  name: 'InfoIndex',
+
+   mounted() {
+    this.listQuery.userVerifyId = this.$route.query.id
+    this.buildingDetails()
+  },
+    methods: {
+      buildingDetails() {
+      this.$store.dispatch('BuildingDetails', this.listQuery).then((res) => {
+       this.listQuery.userName  = res.data.taUser.userName
+       this.listQuery.gender  = res.data.taUser.gender
+       this.listQuery.loginName  = res.data.taUser.loginName
+       this.listQuery.nickname  = res.data.taUser.nickname
+       this.listQuery.openid = res.data.taUser.openid
+       this.listQuery.idCard = res.data.taUser.idCard
+       this.listQuery.headPortrait = res.data.taUser.headPortrait
+       this.listQuery.description = res.data.taUser.description
+       this.listQuery.verifyStatus = res.data.taUserVerify.verifyStatus
+       this.listQuery.faceImg = res.data.taUserVerify.faceImg
+       this.listQuery.roomInfoList  = res.data.roomInfoList
+       console.log('')
+      }).catch(() => {
+        console.log('BuildingDetails error')
+      })
+    },
+  offEnd(){
+    this.listQuery.type= ''
+    this.listQuery.off='2'
+   console.log('this.listQuery.off',this.listQuery.off)
+  },
+  userVerifyAudit(){
+      this.$store.dispatch('VerifyinfoAdd', this.listQuery).then((res) => {
+        const resCode = res.code
+        if (resCode === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'building-index' })
+        }
+      }).catch(() => {
+        console.log('UserVerifyAudit error')
+      })
+    },
+  }
+
 }
+ 
 </script>
 
 <style scoped>