Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

@@ -138,7 +138,13 @@ public class BuildingOwnerInfoController extends BaseController {
     public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+        try {
+            responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+        }catch (Exception e){
+            responseBean.addError("导入数据失败" + e.getMessage());
+            e.printStackTrace();
+        }
+        
         return responseBean;
     }
 

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

@@ -38,10 +38,9 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     /**
      * 查看是否有未认证数据
      * @param ownerTel
-     * @param communityId
      * @return
      */
-    TaUser selectByTel(@Param("loginName") String ownerTel,@Param("communityId") Integer communityId);
+    TaUser selectByTel(@Param("loginName") String ownerTel);
     
     int batchUpdate(List<TaUser> updataTaUserList);
     

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

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserVerify;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * app端用户审核表，存放用户的角色还有房产信息 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-03
+ */
+@Mapper
+public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
+
+}

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

@@ -0,0 +1,111 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * app端用户审核表，存放用户的角色还有房产信息
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserVerify implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    /**
+     * 期ID
+     */
+    private Integer phaseId;
+
+    /**
+     * 期
+     */
+    private String phaseName;
+
+    /**
+     * 楼栋ID
+     */
+    private Integer buildingId;
+
+    /**
+     * 楼栋
+     */
+    private String buildingName;
+
+    /**
+     * 单元
+     */
+    private Integer unitId;
+
+    /**
+     * 单元
+     */
+    private String unitName;
+
+    /**
+     * 楼层id
+     */
+    private Integer levelId;
+
+    /**
+     * 楼层
+     */
+    private String levelName;
+
+    /**
+     * 户号ID
+     */
+    private Integer roomNoId;
+
+    /**
+     * 户号
+     */
+    private String roomNoName;
+
+    /**
+     * 认证状态  0 是未审核   1是审核通过   2是审核不通过
+     */
+    private String verifyStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 审核人的姓名
+     */
+    private String verifyName;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.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 lombok.Data;
@@ -131,5 +132,19 @@ public class TpBuildingOwnerInfo implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateDate;
-
+    
+    /**
+     * 1代表的是户号的树信息
+     */
+    private String treeStatus;
+    
+    /**
+     * 1代表的是资料库信息
+     */
+    private String ownerStatus;
+    /**
+     * 身份
+     */
+    @TableField(exist = false)
+    private String roleName;
 }

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

@@ -53,6 +53,7 @@ import java.util.stream.Collectors;
  */
 @Service("iBuildingOwnerInfoService")
 @Slf4j
+@Transactional
 public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInfoMapper, TpBuildingOwnerInfo> implements IBuildingOwnerInfoService {
 
     @Autowired
@@ -79,6 +80,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private TpBuildingMapper tpBuildingMapper;
     
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+    
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
@@ -97,20 +101,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Map<String, Object> map = Maps.newHashMap();
         // 小区Id
         map.put("community_id", userElement.getCommunityId());
+        map.put("owner_status", "1");
         // 期
-        map.put("phase", tpBuildingOwnerInfo.getPhaseName());
+        //map.put("phase", tpBuildingOwnerInfo.getPhaseName());
         // 栋
-        map.put("building", tpBuildingOwnerInfo.getBuildingName());
+        //map.put("building", tpBuildingOwnerInfo.getBuildingName());
         // 单元
-        map.put("unit", tpBuildingOwnerInfo.getUnitName());
+        //map.put("unit", tpBuildingOwnerInfo.getUnitName());
         // 楼层
-        map.put("level", tpBuildingOwnerInfo.getLevelName());
+        //map.put("level", tpBuildingOwnerInfo.getLevelName());
         // 房号
-        map.put("room_no", tpBuildingOwnerInfo.getName());
+        //map.put("room_no", tpBuildingOwnerInfo.getName());
 
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
-        queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
+        //queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
         queryWrapper.orderByDesc("create_date");
 
         // 分页查询
@@ -385,39 +390,19 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 小区
         map.put("community_id", communityId);
+        map.put("owner_status", "1");
         // 期
-        map.put("phase", tpBuildingOwnerInfo.getPhaseName());
+        //map.put("phase", tpBuildingOwnerInfo.getPhaseName());
         // 栋
-        map.put("building", tpBuildingOwnerInfo.getBuildingName());
+        //map.put("building", tpBuildingOwnerInfo.getBuildingName());
         // 单元
-        map.put("unit", tpBuildingOwnerInfo.getUnitName());
+        //map.put("unit", tpBuildingOwnerInfo.getUnitName());
         // 楼层
-        map.put("level", tpBuildingOwnerInfo.getLevelName());
+        //map.put("level", tpBuildingOwnerInfo.getLevelName());
 
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
 
-        /**
-         * 通过分组来去重
-         *
-         * 1. phase 为空表示为 phase 字段进行分组
-         * 2. building 为空表示为 building 字段进行分组
-         * 3. unit 为空表示为 unit 字段进行分组
-         * 4. level 为空表示为 level 字段进行分组
-         * 5. room_no 为空表示为 room_no 字段进行分组
-         */
-        if (null == tpBuildingOwnerInfo.getPhaseName() || "".equals(tpBuildingOwnerInfo.getPhaseName())) {
-            queryWrapper.groupBy("phase");
-        } else if (null == tpBuildingOwnerInfo.getBuildingName() || "".equals(tpBuildingOwnerInfo.getBuildingName())) {
-            queryWrapper.groupBy("building");
-        } else if (null == tpBuildingOwnerInfo.getUnitName() || "".equals(tpBuildingOwnerInfo.getUnitName())) {
-            queryWrapper.groupBy("unit");
-        } else if (null == tpBuildingOwnerInfo.getLevelName() || "".equals(tpBuildingOwnerInfo.getLevelName())) {
-            queryWrapper.groupBy("level");
-        } else if (null == tpBuildingOwnerInfo.getName() || "".equals(tpBuildingOwnerInfo.getName())) {
-            queryWrapper.groupBy("room_no");
-        }
-
         /**
          * 1.如果 楼栋值不存在表示根据小区Id查询时查询楼栋!
          * 2.如果 楼栋存在表示查询单元
@@ -454,41 +439,92 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         //获取要上传的数据
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
-        list.stream().forEach(BuildingOwnerInfo -> {
-            BuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
-            BuildingOwnerInfo.setVerifyStatus(Constant.UN_VERIFY_STATUS);
-            BuildingOwnerInfo.setCreateUser(userElement.getId());
-            BuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-            BuildingOwnerInfo.setUpdateUser(userElement.getId());
-            BuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        });
-        //批量插入
-	    tpBuildingOwnerInfoMapper.batchInsert(list);
-        //判断是否认证过
-        List<TpBuildingOwnerInfo> updateList = new ArrayList<TpBuildingOwnerInfo>();
-        List<TaUser> updataTaUserList = new ArrayList<TaUser>();
-        list.stream().forEach(BuildingOwnerInfo -> {
-            TaUser taUser = taUserMapper.selectByTel(BuildingOwnerInfo.getOwnerTel(),BuildingOwnerInfo.getCommunityId());
-            if (null != taUser){
-                BuildingOwnerInfo.setVerifyStatus(Constant.VERIFY_STATUS);
-                updateList.add(BuildingOwnerInfo);
-                taUser.setVerifyStatus(Constant.VERIFY_STATUS);
-                taUser.setBuildingOwnerInfoId(BuildingOwnerInfo.getId());
-                updataTaUserList.add(taUser);
-            }
-        });
+        
         //批量更新
-        if (updateList.size() > 0){
-	        tpBuildingOwnerInfoMapper.batchUpdate(updateList);
-        }
-        if (updataTaUserList.size() > 0){
-            taUserMapper.batchUpdate(updataTaUserList);
-            taUserMapper.batchUpdateRole(updataTaUserList);
+        tpBuildingOwnerInfoMapper.batchUpdate(list);
+        
+        //构造数据
+        for (TpBuildingOwnerInfo tpBuildingOwnerInfo : list){
+            //根据手机号查询这个手机号是否注册
+            TaUser taUser = taUserMapper.selectByTel(tpBuildingOwnerInfo.getOwnerTel());
+            if (null == taUser){
+                //插入新用户并审核通过
+                addNewUser(tpBuildingOwnerInfo,userElement);
+            }else {
+                //已经有用户的情况下看是否审核通过，是否要添加新的房产
+                checkUserVerify(taUser,tpBuildingOwnerInfo,userElement);
+            }
         }
         responseBean.addSuccess("success");
         return responseBean;
     }
-
+    
+    private void checkUserVerify(TaUser taUser, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+        //有用户的情况下查看是否有申请的房产
+        QueryWrapper<TaUserVerify> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id",userElement.getCommunityId());
+        queryWrapper.eq("user_id",taUser.getId());
+        List<TaUserVerify> verifyList = taUserVerifyMapper.selectList(queryWrapper);
+        if (verifyList.size() > 0){
+            verifyList.stream().forEach(e -> {
+                if (e.getRoomNoId().equals(tpBuildingOwnerInfo.getId()) && e.getVerifyStatus().equals("0")){
+                    e.setVerifyStatus("1");
+                    e.setVerifyName(userElement.getUserName());
+                    taUserVerifyMapper.updateById(e);
+                }
+            });
+            return;
+        }
+        //插入一条房产数据
+        saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
+    }
+    
+    /**
+     * 插入新用户并审核通过
+     * @param tpBuildingOwnerInfo
+     * @param userElement
+     */
+    private void addNewUser(TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+        //插入用户
+        TaUser taUser = new TaUser();
+        taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+        taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+        taUser.setStatus("1");
+        taUser.setCreateDate(LocalDateTime.now());
+        taUser.setFaceStatus("0");
+        taUserMapper.insert(taUser);
+        //审核通过
+        saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
+        
+    }
+    
+    private void saveVerifyData(Integer userId, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+        TaUserVerify taUserVerify = new TaUserVerify();
+        taUserVerify.setUserId(userId);
+        taUserVerify.setCommunityId(userElement.getCommunityId());
+        if (tpBuildingOwnerInfo.getRoleName().equals("户主")){
+            taUserVerify.setRoleId(1);
+        }else if (tpBuildingOwnerInfo.getRoleName().equals("家属")){
+            taUserVerify.setRoleId(3);
+        }else if (tpBuildingOwnerInfo.getRoleName().equals("租客")){
+            taUserVerify.setRoleId(2);
+        }
+        taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
+        taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
+        taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());
+        taUserVerify.setBuildingName(tpBuildingOwnerInfo.getBuildingName());
+        taUserVerify.setUnitId(tpBuildingOwnerInfo.getUnitId());
+        taUserVerify.setUnitName(tpBuildingOwnerInfo.getUnitName());
+        taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
+        taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
+        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getId());
+        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getName());
+        taUserVerify.setVerifyStatus("1");
+        taUserVerify.setCreateDate(LocalDateTime.now());
+        taUserVerify.setVerifyName(userElement.getUserName());
+        taUserVerifyMapper.insert(taUserVerify);
+    }
+    
     @Override
     public ResponseBean updataApprove(String paramets) {
         ResponseBean response = new ResponseBean();
@@ -562,7 +598,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             //从第一行开始第一行一般是标题
             for (int j = 3; j <= lastRowNum; j++) {
                 Row row = sheet.getRow(j);
-                TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
                 String buildingInfo = row.getCell(0).getStringCellValue().trim();
                 String roomNoId = row.getCell(1).getStringCellValue().trim();
                 String ownerName = row.getCell(2).getStringCellValue().trim();
@@ -610,14 +645,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 //把数据塞入temList校验是否有重复的数据
                 temBuildingList.add(roomNoId);
                 //构建数据
-                tpBuildingOwnerInfo.setPhaseName(phase);
-                tpBuildingOwnerInfo.setBuildingName(building);
-                tpBuildingOwnerInfo.setUnitName(unit);
-                tpBuildingOwnerInfo.setLevelName(level);
-                tpBuildingOwnerInfo.setName(roomNo);
-                tpBuildingOwnerInfo.setOwnerName(ownerName);
-                tpBuildingOwnerInfo.setOwnerTel(ownerTel);
-                list.add(tpBuildingOwnerInfo);
+                checkOwnerInfo.setRoleName(ownerRole);
+                checkOwnerInfo.setOwnerName(ownerName);
+                checkOwnerInfo.setOwnerTel(ownerTel);
+                checkOwnerInfo.setOwnerStatus("1");
+                list.add(checkOwnerInfo);
             }
         }
         //构建分页

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

@@ -351,6 +351,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuildingOwnerInfoNew.setLevelName(lastLevelName);
 				tpBuildingOwnerInfoNew.setName(tpBuildingOwnerInfo.getName());
 				tpBuildingOwnerInfoNew.setCreateDate(LocalDateTime.now());
+				tpBuildingOwnerInfoNew.setTreeStatus("1");
 				tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfoNew);
 			}
 		}

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

@@ -315,7 +315,6 @@
     <include refid="Base_Column_List" />
     from ta_user
     where login_name = #{loginName,jdbcType=VARCHAR}
-    and community_id = #{communityId,jdbcType=INTEGER}
     and verify_status = 0
   </select>
 

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+
+</mapper>

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

@@ -50,9 +50,11 @@
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update tp_building_owner_info
             <set>
-                verify_status=${item.verifyStatus}
+                owner_name = #{item.ownerName},
+                owner_tel = #{item.ownerTel},
+                owner_status = #{item.ownerStatus}
             </set>
-            where id = ${item.id}
+            where id = #{item.id}
         </foreach>
     </update>
 

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

@@ -14,23 +14,26 @@
     </el-form>
     <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">
       <el-table-column label="期/区" align="center">
-        <template slot-scope="scope">{{ scope.row.phase }}</template>
+        <template slot-scope="scope">{{ scope.row.phaseName }}</template>
       </el-table-column>
       <el-table-column label="栋" align="center">
-        <template slot-scope="scope">{{ scope.row.building }}</template>
+        <template slot-scope="scope">{{ scope.row.buildingName }}</template>
       </el-table-column>
       <el-table-column label="单元" align="center">
-        <template slot-scope="scope">{{ scope.row.unit }}</template>
+        <template slot-scope="scope">{{ scope.row.unitName }}</template>
       </el-table-column>
       <el-table-column label="楼层" align="center">
-        <template slot-scope="scope">{{ scope.row.level }}</template>
+        <template slot-scope="scope">{{ scope.row.levelName }}</template>
       </el-table-column>
       <el-table-column label="户号" align="center">
-        <template slot-scope="scope">{{ scope.row.roomNo }}</template>
+        <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
       <el-table-column label="业主姓名" align="center">
         <template slot-scope="scope">{{ scope.row.ownerName }}</template>
       </el-table-column>
+      <el-table-column label="身份" align="center">
+        <template slot-scope="scope">{{ scope.row.roleName }}</template>
+      </el-table-column>
       <el-table-column label="手机号码" align="center">
         <template slot-scope="scope">{{ scope.row.ownerTel }}</template>
       </el-table-column>