合并

CODE/smart-community/app-api/pom.xml

@@ -195,12 +195,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.1.5.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
 
 
     </dependencies>

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

@@ -280,13 +280,13 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/user/tenantAndRelation/delete", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/user/tenantAndRelation/delete/{userVerifyId}", method = RequestMethod.DELETE)
     @ApiOperation(value = "业主删除 家属或者租客", notes = "业主删除 家属或者租客")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "form", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核 id"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核 id"),
             @ApiImplicitParam(paramType = "header",dataTypeClass = String.class,name = "X-Auth-Token",value = "Token")
     })
-    public ResponseBean deleteTenantAndRelation(HttpSession session, @RequestParam("userVerifyId") Integer userVerifyId) {
+    public ResponseBean deleteTenantAndRelation(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
         responseBean = iTaUserService.deleteTenantAndRelation(userElement, userVerifyId);

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

@@ -176,6 +176,15 @@ public class TaUserServiceImpl implements ITaUserService {
         TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(currentUser, taUserVO);
 
+        // 默认未绑定微信
+        taUserVO.setBindingWX(Constant.NO_BINDING_WX);
+
+        // 如果存在值，则已绑定微信
+        if (StringUtils.isNotBlank(currentUser.getOpenid())) {
+            taUserVO.setBindingWX(Constant.BINDING_WX);
+        }
+
+
         // 校验房产
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
         // 无关联房产
@@ -824,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());
@@ -833,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, 获取 用户的住址, 人脸是否认证, 角色
@@ -858,6 +871,17 @@ public class TaUserServiceImpl implements ITaUserService {
 
         BeanTools.copyProperties(user, userVO);
 
+        // 房产状态
+        userVO.setVerifyStatus(user.getVerifyStatus());
+
+        // 默认未绑定微信
+        userVO.setBindingWX(Constant.NO_BINDING_WX);
+
+        // 如果存在值，则已绑定微信
+        if (StringUtils.isNotBlank(user.getOpenid())) {
+            userVO.setBindingWX(Constant.BINDING_WX);
+        }
+
         /**
          * 获取楼栋信息，不能 根据 app用户表的楼栋资料库id 来获取，要根据当前登录的 房产id 来查询 app审核表  获取，用户 session 里面有 房产id
          */

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;
 
     /** 角色 **/
@@ -87,4 +87,7 @@ public class TaUserVO {
 
     /**  户号id **/
     private Integer roomNoId;
+
+    /** 是否绑定了微信 **/
+    private Integer bindingWX;
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -219,4 +219,19 @@ public class Constant {
      * 人员状态  无效
      */
     public static final String INVALID_STATUS = "0";
+
+    /** 已绑定微信 **/
+    public static final Integer BINDING_WX = 1;
+
+    /** 未绑定微信 **/
+    public static final Integer NO_BINDING_WX = 0;
+
+    /** 用户审核通过 **/
+    public static final String APPROVED = "1";
+
+    /** 用户审核不通过 **/
+    public static final String REJECTED = "2";
+
+    /** 用户待审核 **/
+    public static final String TO_AUDIT = "0";
 }

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.3.9
+version=0.0.1
+groupId=com.community
+artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,32 @@
+com\community\commom\redis\RedisTemplate.class
+com\community\commom\redis\RedisConfiguration.class
+com\community\commom\utils\OssUtil.class
+com\community\commom\redis\SingleRedisTemplate.class
+com\community\commom\utils\EnumUtils.class
+com\community\commom\hk\HttpClientSSLUtils$2.class
+com\community\commom\redis\RedisJsonSerializer.class
+com\community\commom\uuid\IdGen.class
+com\community\commom\utils\BeanTools.class
+com\community\commom\hk\HttpClientSSLUtils.class
+com\community\commom\session\UserElement.class
+com\community\commom\utils\CommonUtils.class
+com\community\commom\redis\RedisSerializer.class
+com\community\commom\utils\StringConverter.class
+com\community\commom\mode\ResponseBean.class
+com\community\commom\utils\DESUtils.class
+com\community\commom\redis\FastJsonSerializer.class
+com\community\commom\utils\DateUtils.class
+com\community\commom\utils\HttpClientUtils.class
+com\community\commom\constant\Constant.class
+com\community\commom\utils\CookieUtil.class
+com\community\commom\mode\HkResponseBean.class
+com\community\commom\ailiyun\AESDecode.class
+com\community\commom\uuid\IdGen$IdGenHolder.class
+com\community\commom\utils\PayPriceUtils.class
+com\community\commom\hk\HttpClientSSLUtils$1.class
+com\community\commom\utils\MD5Utils.class
+com\community\commom\redis\RedisObjectSerializer.class
+com\community\commom\utils\QRCodeGeneratorUtils.class
+com\community\commom\redis\SerializationFailedException.class
+com\community\commom\hk\Digests.class
+com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,29 @@
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java

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

@@ -0,0 +1,122 @@
+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;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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
+@RequestMapping("/")
+@Api(value = "审核用户API", description = "审核用户API")
+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({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "phone", value = "手机号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userName", value = "用户名"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageSize", value = "一页多少行"),
+    })
+    public ResponseBean getAll(@RequestParam(value = "phone", required = false) String phone,
+                               @RequestParam(value = "userName", required = false) String userName,
+                               @RequestParam(value = "idCard", required = false) String idCard,
+                               @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/audit/{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 = "query", dataTypeClass = Boolean.class, name = "verifyStatus", value = "true通过；false不通过"),
+    })
+    public ResponseBean getAll(@PathVariable("userVerifyId") Integer userVerifyId,
+                               @RequestParam("verifyStatus") Boolean verifyStatus,
+                               HttpSession session) {
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserVerifyService.auditUser(userElement, userVerifyId, verifyStatus);
+        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/dao/TaUserVerifyMapper.java

@@ -1,8 +1,13 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TaUserVerify;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +20,14 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
 
+    /**
+     * 根据 手机号 、用户名、身份证
+     * @param page
+     * @param phone
+     * @param userName
+     * @param idCard
+     * @return
+     */
+    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard);
+
 }

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/java/com/community/huiju/model/TaUserVerify.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 lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -107,5 +108,30 @@ public class TaUserVerify implements Serializable {
      */
     private String verifyName;
 
+    // =============================================
+
+    /**
+     * 手机号
+     */
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 用户姓名
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 身份证
+     */
+    @TableField(exist = false)
+    private String idCard;
+
+    /**
+     * 性别 1：男   2：女
+     */
+    @TableField(exist = false)
+    private String gender;
 
 }

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

@@ -0,0 +1,33 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUserVerify;
+
+/**
+ * 审核 业务
+ */
+public interface ITaUserVerifyService extends IService<TaUserVerify> {
+
+    /**
+     * 查询 所有审核数据
+     * @param phone
+     * @param userName
+     * @param idCard
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize);
+
+    /**
+     * 审核 用户
+     * @param userElement
+     * @param userVerifyId
+     * @param verifyStatus
+     * @return
+     */
+    ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus);
+
+}

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

@@ -878,7 +878,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                         buildingOwnerInfo.getBuildingName() +
                         buildingOwnerInfo.getUnitName() +
                         buildingOwnerInfo.getLevelName() +
-                        buildingOwnerInfo.getRoleName();
+                        buildingOwnerInfo.getRoomNoName();
 
                 cell = row.createCell(0);
                 cell.setCellValue(address);

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

@@ -0,0 +1,75 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.TaUserMapper;
+import com.community.huiju.dao.TaUserVerifyMapper;
+import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserVerify;
+import com.community.huiju.model.User;
+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 java.util.List;
+
+/**
+ * 审核 业务实现
+ *
+ * @author weiximei
+ */
+@Service
+public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaUserVerify> implements ITaUserVerifyService {
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Override
+    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<TaUserVerify> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard);
+        responseBean.addSuccess(userVerifyIPage);
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError("审核数据不存在！");
+            return responseBean;
+        }
+
+        if (!Constant.TO_AUDIT.equals(userVerify.getVerifyStatus())) {
+            responseBean.addError("审核状态错误！");
+            return responseBean;
+        }
+
+        User user = userMapper.selectById(userElement.getId());
+        String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
+        userVerify.setVerifyStatus(status);
+        userVerify.setVerifyName(user.getUserName());
+
+        taUserVerifyMapper.updateById(userVerify);
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+}

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

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TaUserVerifyMapper">
 
+    <select id="selectAllByPhoneAndUserNameAndIdCard" resultType="com.community.huiju.model.TaUserVerify" >
+        select
+            tav.*,
+            tu.user_name as userName,
+            tu.login_name as phone,
+            tu.id_card as idCard,
+            tu.gender as gender
+        from
+          ta_user_verify tav LEFT JOIN ta_user tu on tav.user_id = tu.id
+        <where>
+            <trim suffixOverrides="and | or">
+                tav.verify_status = 0
+                <if test="phone != null and phone != ''">
+                    and tu.login_name like CONCAT('%',#{phone},'%')
+                </if>
+                <if test="userName != null and userName != ''">
+                    and tu.user_name like CONCAT('%',#{userName},'%')
+                </if>
+                <if test="idCard != null and idCard != ''">
+                    and tu.id_card like CONCAT('%',#{idCard},'%')
+                </if>
+            </trim>
+        </where>
+    </select>
+
 </mapper>

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

@@ -61,22 +61,22 @@
     <select id="selectListByParams" resultType="com.community.huiju.model.TpBuildingOwnerInfo">
         SELECT
             t.id,
-            t.community_id,
-            t.owner_tel,
-            t.owner_name,
-            t.id_card,
-            r.description as role_name,
-            u.verify_status,
-            m.user_name AS update_name,
-            t.update_date
+            t.community_id as communityId,
+            t.owner_tel as ownerTel,
+            t.owner_name as ownerName,
+            t.id_card as idCard,
+            r.description as roleName,
+            u.verify_status as verifyStatus,
+            m.user_name AS updateName,
+            t.update_date as updateDate
         FROM
             tp_building_owner_info t
-            LEFT JOIN ta_user_verify u ON t.id = u.room_no_id
+            LEFT JOIN ta_user_verify u ON t.room_no_id = u.room_no_id
             LEFT JOIN ta_sys_role r ON u.role_id = r.id
             LEFT JOIN tp_user m ON t.update_user = m.id
         WHERE
-            t.owner_status = 1
-        and t.community_id=#{tpBuildingOwnerInfo.communityId,jdbcType=INTEGER}
+
+        t.community_id=#{tpBuildingOwnerInfo.communityId,jdbcType=INTEGER}
         <if test="tpBuildingOwnerInfo.phaseId != null and tpBuildingOwnerInfo.phaseId != ''">
             and t.phase_id = #{tpBuildingOwnerInfo.phaseId,jdbcType=INTEGER}
         </if>
@@ -89,8 +89,8 @@
         <if test="tpBuildingOwnerInfo.levelId != null and tpBuildingOwnerInfo.levelId != ''">
             and t.level_id = #{tpBuildingOwnerInfo.levelId,jdbcType=INTEGER}
         </if>
-        <if test="tpBuildingOwnerInfo.id != null and tpBuildingOwnerInfo.id != ''">
-            and t.id = #{tpBuildingOwnerInfo.id,jdbcType=INTEGER}
+        <if test="tpBuildingOwnerInfo.roomNoId != null and tpBuildingOwnerInfo.roomNoId != ''">
+            and t.room_no_id = #{tpBuildingOwnerInfo.roomNoId,jdbcType=INTEGER}
         </if>
         <if test="tpBuildingOwnerInfo.ownerName != null and tpBuildingOwnerInfo.ownerName != ''">
             and t.owner_name like concat('%',#{tpBuildingOwnerInfo.ownerName,jdbcType=VARCHAR},'%')

CODE/smart-community/property-api/src/test/java/com/community/huiju/DemoApplicationTests.java

@@ -1,22 +1,13 @@
 package com.community.huiju;
 
-import com.alibaba.fastjson.JSONObject;
-import com.community.huiju.dao.ToCommunitiesMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.dao.TpSysRoleMapper;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpSysRole;
-import com.google.common.collect.Maps;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.time.Instant;
-import java.util.List;
-import java.util.Map;
+
 
 @RunWith(SpringRunner.class)
 @SpringBootTest

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

@@ -54,8 +54,8 @@ export function buildingList(data) {
       phaseId: data.phaseId,
       buildingId: data.buildingId,
       unitId: data.unitId,
-      lelevelIdvel: data.levelId,
-      id: data.roomNoId,
+      levelId: data.levelId,
+      roomNoId: data.roomNoId,
       ownerName: data.ownerName,
       ownerTel: data.ownerTel,
       idCard: data.idCard,

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

@@ -79,3 +79,46 @@ export function upDateStatus(data) {
     }
   })
 }
+
+// 获取审核列表
+export function userVerifyAll(data) {
+  return request({
+    url: '/user/verify/all',
+    method: 'get',
+    params: {
+      phone: data.phone,
+      userName: data.userName,
+      idCard: data.idCard,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+
+// 审核用户
+export function userVerifyAudit(data) {
+  return request({
+    url: '/user/verify/audit/' + data.userVerifyId,
+    method: 'put',
+    params: {
+      verifyStatus: data.verifyStatus
+    }
+  })
+}
+
+// 校验移动端手机号是否注册以及业主
+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 } from '@/api/user'
+import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, userVerifyAll, userVerifyAudit, taUserHas } from '@/api/user'
 
 const user = {
   state: {
@@ -174,6 +174,33 @@ const user = {
           reject(error)
         })
       })
+    },
+    UserVerifyAll({ commit }, data) { // 审核用户列表
+      return new Promise((resolve, reject) => {
+        userVerifyAll(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    UserVerifyAudit({ commit }, data) { // 审核用户
+      return new Promise((resolve, reject) => {
+        userVerifyAudit(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          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/audit/index.vue

@@ -1,15 +1,209 @@
 <template>
   <div id="root">
-    审核资料
+    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="手机号">
+        <el-input v-model="formInline.phone" placeholder="手机号"/>
+      </el-form-item>
+      <el-form-item label="姓名">
+        <el-input v-model="formInline.userName" placeholder="姓名"/>
+      </el-form-item>
+      <el-form-item label="身份证">
+        <el-input v-model="formInline.idCard" placeholder="身份证"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="clear">清空</el-button>
+        <el-button type="primary" @click="queryList">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <span style="color: #99a9bf; font-size: 13px; margin-left: 20px;">注意，审核后无法修改审核结果，请仔细确认</span>
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      border
+      tooltip-effect="dark"
+      style="width: 100%"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        align="center"
+        type="selection"
+        width="55"/>
+      <el-table-column
+        align="center"
+        prop="userName"
+        label="姓名"/>
+      <el-table-column
+        align="center"
+        prop="phone"
+        label="手机号"/>
+      <el-table-column
+        align="center"
+        prop="idCard"
+        label="身份证"/>
+      <el-table-column
+        align="center"
+        prop="gender"
+        label="性别">
+        <template slot-scope="scope">{{ scope.row.gender === '1' ? '男' : '女' }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="address"
+        label="房产">
+        <template slot-scope="scope">{{ scope.row.phaseName + scope.row.buildingName + scope.row.unitName + scope.row.levelName + scope.row.roomNoName }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="userRole"
+        label="角色">
+        <template slot-scope="scope">{{ showRoleName(scope.row.roleId) }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="createDate"
+        label="提交时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="primary" @click="userVerifyAudit(scope.row.id,true)">通过</el-button>
+          <el-button type="danger" @click="userVerifyAudit(scope.row.id,false)">不通过</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <div class="footer-page">
+      <el-pagination
+        :current-page="formInline.pageNum"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="formInline.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'Audit'
+  name: 'Audit',
+  data() {
+    return {
+      formInline: {
+        phone: '',
+        userVerifyId: '',
+        verifyStatus: true,
+        userName: '',
+        idCard: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 总数
+      tableData: [] // 数据体
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    clear() { // 清空
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.formInline.userName = ''
+      this.formInline.phone = ''
+      this.formInline.idCard = ''
+      this.getData()
+    },
+    queryList() { // 查询
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.getData()
+    },
+    handleSelectionChange(val) { // 选择
+      this.multipleSelection = val
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+    },
+    getData() {
+      this.$store.dispatch('UserVerifyAll', this.formInline).then((res) => {
+        const resCode = res.code
+        if (resCode === '0') {
+          const resData = res.data
+          this.tableData = resData.records
+          this.formInline.pageNum = resData.pageNum
+          this.formInline.pageSize = resData.pageSize
+          this.total = resData.total
+        }
+      }).catch(() => {
+        console.log('UserVerifyAll error')
+      })
+    },
+    userVerifyAudit(verifyId,vstatus){
+      this.formInline.userVerifyId = verifyId
+      this.formInline.verifyStatus = vstatus
+      this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {
+        const resCode = res.code
+        if (resCode === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.getData()
+          return
+        }
+        this.$message.error(res.message)
+      }).catch(() => {
+        console.log('UserVerifyAudit error')
+      })
+    },
+    showRoleName(roleId) {
+      let str = ''
+      switch (roleId) {
+        case 1:
+          str = '业主'
+          break
+        case 2:
+          str = '租客'
+          break
+        case 3:
+          str = '家属'
+          break
+      }
+
+      return str
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    }
+  }
 }
 </script>
 
 <style scoped>
-
+.demo-form-inline {
+  margin-top: 20px;
+  margin-left: 20px;
+}
+.footer-page {
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -3,7 +3,7 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
-        <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
+        <el-upload :on-change="handleChange" :before-upload="beforeUpload" :limit="1" class="upload-demo" action="" multiple>
           <!-- <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"></a> -->
           <el-button style="margin-left: 10px;" size="large" type="primary" @click="exportExcel">下载模板-小区</el-button>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from "vuex";
+import { mapState, mapActions } from 'vuex'
 export default {
   data() {
     return {
@@ -59,93 +59,93 @@ export default {
     }
   },
   computed: {
-    ...mapState("batchImport", {
+    ...mapState('batchImport', {
       temlist: s => s.temlist,
       total: s => s.total
     })
   },
   created() {
-    console.log(mapActions);
+    console.log(mapActions)
   },
   methods: {
-    ...mapActions("batchImport", [
-      "UploadBuildingExcel",
-      "SubmitBuildingExcel"
+    ...mapActions('batchImport', [
+      'UploadBuildingExcel',
+      'SubmitBuildingExcel'
     ]),
     handleSizeChange(val) {
-      this.listQuery.pageSize = val;
-      this.getList();
-      console.log(`每页 ${val} 条`);
+      this.listQuery.pageSize = val
+      this.getList()
+      console.log(`每页 ${val} 条`)
     },
     handleCurrentChange(val) {
-      this.listQuery.pageNum = val;
-      this.getList();
-      console.log(`当前页: ${val}`);
+      this.listQuery.pageNum = val
+      this.getList()
+      console.log(`当前页: ${val}`)
     },
     dialogBatchImport() {
-      this.$router.push({ name: "batch-import" });
+      this.$router.push({ name: 'batch-import' })
     },
     beforeUpload(file) {
-      const extension = file.name.split(".")[1] === "xls";
-      const extension2 = file.name.split(".")[1] === "xlsx";
+      const extension = file.name.split('.')[1] === 'xls'
+      const extension2 = file.name.split('.')[1] === 'xlsx'
       if (!extension && !extension2) {
-        this.$message.warning("上传文件只能是 xls、xlsx格式!");
-        return;
+        this.$message.warning('上传文件只能是 xls、xlsx格式!')
+        return
       }
-      this.files = file;
-      return false; // 返回false不会自动上传
+      this.files = file
+      return false // 返回false不会自动上传
     },
     handleChange(file) {
-      const fileName = file.name;
-      if (fileName === "") {
-        this.$message.warning("请选择要上传的文件！");
-        return false;
+      const fileName = file.name
+      if (fileName === '') {
+        this.$message.warning('请选择要上传的文件！')
+        return false
       }
       this.UploadBuildingExcel(file)
         .then(response => {
-          if (response.code === "1") {
-            this.$message.warning(response.message);
+          if (response.code === '1') {
+            this.$message.warning(response.message)
           }
-          if (response.code === "0") {
-            this.$message.success("上传成功");
-            this.getList();
+          if (response.code === '0') {
+            this.$message.success('上传成功')
+            this.getList()
           }
         })
         .catch(() => {
-          console.log("upload error");
-        });
+          console.log('upload error')
+        })
     },
     submitUpload() {
       if (this.files === null) {
-        this.$message.warning("没有需要提交的文件");
-        return false;
+        this.$message.warning('没有需要提交的文件')
+        return false
       }
-      let file = {
+      const file = {
         raw: this.files
-      };
+      }
       this.SubmitBuildingExcel(file)
         .then(response => {
-          if (response.code === "1") {
-            this.$message.warning(response.message);
+          if (response.code === '1') {
+            this.$message.warning(response.message)
           }
-          if (response.code === "0") {
-            this.$message.success("提交成功");
-            this.dialogBuildingIndex();
+          if (response.code === '0') {
+            this.$message.success('提交成功')
+            this.dialogBuildingIndex()
           }
         })
         .catch(() => {
-          console.log("upload error");
-        });
+          console.log('upload error')
+        })
     },
     getList() {
       this.list = this.temlist.slice(
         (this.listQuery.pageNum - 1) * this.listQuery.pageSize,
         this.listQuery.pageNum * this.listQuery.pageSize
-      );
-      console.log(this.list);
+      )
+      console.log(this.list)
     },
     dialogBuildingIndex() {
-      this.$router.push({ name: "building-index" });
+      this.$router.push({ name: 'building-index' })
     },
     exportExcel() {
       this.$store.dispatch('BuildingDownloadExcel').then(res => {
@@ -161,7 +161,7 @@ export default {
       })
     }
   }
-};
+}
 </script>
 
 <style scoped>

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
     }
   }
 }