提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -44,9 +44,27 @@ public interface TpBuildingOwnerInfoMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
             " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
-            " and level_id=#{levelId} and room_no_id=#{roomNoId} and verify_status=1")
+            " and level_id=#{levelId} and room_no_id=#{roomNoId}")
     TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
                                                     @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
                                                     @Param("levelId") Integer level, @Param("roomNoId") Integer roomNoId);
 
+    /*
+     * 根据 小区，期，楼栋，单元，楼层，户号, 手机号
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and room_no_id=#{roomNoId} and owner_tel=#{phone}")
+    TpBuildingOwnerInfo selectCommunityAndAddressAndPhone(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
+                                                          @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId,
+                                                          @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId,
+                                                          @Param("phone") String phone);
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.TaUserVerifyServicel;
 import com.community.huiju.vo.TaUserVO;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -223,10 +225,89 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             userVerify.setVerifyStatus(userVerifyStatus);
             userVerify.setRemark(remark);
             taUserVerifyMapper.updateByPrimaryKeySelective(userVerify);
+
+            // 获取这个被审核的用户
+            TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+
+            // 往楼栋资料库插入数据
+            // 校验楼栋信息表
+            TpBuildingOwnerInfo selectBuild = getBuildingInfo(userElement, user.getLoginName());
+            if (null == selectBuild) {
+                // 插入楼栋信息数据
+                insertTpBuildingOwnerInfo(userElement, user, null);
+            }
+
             responseBean.addSuccess("操作成功！");
             return responseBean;
         }
         responseBean.addError("操作失败！");
         return responseBean;
     }
+
+    /**
+     * 查询 楼栋信息
+     *      根据小区Id, 栋,单元,楼层,房号, 手机号
+     * @param userElement
+     * @param phone
+     * @return
+     */
+    private TpBuildingOwnerInfo getBuildingInfo(UserElement userElement, String phone) {
+
+        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
+                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(),
+                userElement.getRoomNoId(), phone);
+
+        return selectBuild;
+    }
+
+    /**
+     * 插入 楼栋资料库
+     *
+     * @param userElement
+     * @param user
+     * @param userId 创建人
+     */
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (UserElement userElement, TaUser user, Integer userId) {
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+        // 查询 期/楼栋/单元/层/户号
+        TpPhase phase = tpPhaseMapper.selectByPrimaryKey(userElement.getPhaseId());
+        TpBuilding building = tpBuildingMapper.selectByPrimaryKey(userElement.getBuildingId());
+        TpUnit unit = tpUnitMapper.selectByPrimaryKey(userElement.getUnitId());
+        TpLevel level = tpLevelMapper.selectByPrimaryKey(userElement.getLevelId());
+        TpRoomNo roomNo = tpRoomNoMapper.selectByPrimaryKey(userElement.getRoomNoId());
+
+
+        // 主键是自增的, 所以设置为 null
+        tpBuildingOwnerInfo.setId(null);
+        tpBuildingOwnerInfo.setPhaseId(phase.getId());
+        tpBuildingOwnerInfo.setPhaseName(phase.getName());
+        tpBuildingOwnerInfo.setBuildingId(building.getId());
+        tpBuildingOwnerInfo.setBuildingName(building.getName());
+        tpBuildingOwnerInfo.setUnitId(unit.getId());
+        tpBuildingOwnerInfo.setUnitName(unit.getName());
+        tpBuildingOwnerInfo.setLevelId(level.getId());
+        tpBuildingOwnerInfo.setLevelName(level.getName());
+        tpBuildingOwnerInfo.setRoomNoId(roomNo.getId());
+        tpBuildingOwnerInfo.setRoomNoName(roomNo.getName());
+        tpBuildingOwnerInfo.setOwnerName(user.getUserName());
+        tpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
+        tpBuildingOwnerInfo.setGender(user.getGender());
+        // tpBuildingOwnerInfo.setUpdateUser(userId);
+        tpBuildingOwnerInfo.setUpdateDate(new Date());
+        tpBuildingOwnerInfo.setCreateDate(new Date());
+        // tpBuildingOwnerInfo.setCreateUser(userId);
+        tpBuildingOwnerInfo.setVerifyStatus("1");
+        tpBuildingOwnerInfo.setPairStatus("1");
+
+        // 添加的时候, 默认是当前操作的小区
+        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+
+        int row = tpBuildingOwnerInfoMapper.insertSelective(tpBuildingOwnerInfo);
+        if (row <= 0) {
+            log.error("添加操作! 楼栋业主信息表 失败!");
+            throw new WisdomException("操作失败!");
+        }
+        return tpBuildingOwnerInfo;
+    }
+
 }

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

@@ -734,16 +734,17 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId) {
 
+        /**
+         * 楼栋资料删除的是 审核表里面的数据
+         */
+
         ResponseBean responseBean = new ResponseBean();
         ids.stream().forEach(e->{
-            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
-            if ("1".equals(buildingOwnerInfo.getVerifyStatus())) {
-                throw new WisdomException("不能删除已认证的楼栋资料!");
-                /**
-                 * 批量删除的时候,只要存在一个已认证的楼栋资料, 就停止删除!
-                 */
+            TaUserVerify userVerify = taUserVerifyMapper.selectById(e);
+            if ("1".equals(userVerify.getVerifyStatus())) {
+                throw new WisdomException("不能删除已审核的资料!");
             }
-            tpBuildingOwnerInfoMapper.deleteById(buildingOwnerInfo.getId());
+            taUserVerifyMapper.deleteById(e);
         });
 
         responseBean.addSuccess("操作成功!");