修复 楼栋下载模板

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

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBuilding;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -20,6 +23,14 @@ public interface TpBuildingMapper {
 
     int updateByPrimaryKey(TpBuilding record);
 
-
+    /**
+     * 根据小区id，期id
+     * @param communityId
+     * @param phaseId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building where community_id=#{communityId} and phase_id=#{phaseId}")
+    List<TpBuilding> selectByCommunityIdAndPhaseId(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId);
 
 }

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

@@ -2,6 +2,11 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpPhase;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpPhaseMapper {
@@ -16,4 +21,13 @@ public interface TpPhaseMapper {
     int updateByPrimaryKeySelective(TpPhase record);
 
     int updateByPrimaryKey(TpPhase record);
+
+    /**
+     * 根据小区查询 期
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_phase where community_id = #{communityId}")
+    List<TpPhase> selectByCommunityId(@Param("communityId") Integer communityId);
 }

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

@@ -26,6 +26,7 @@ public interface IBuildingOwnerInfo {
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
+     * 并校验这个用户，是否绑定了这个房产
      * @param phaseId
      * @param buildingId
      * @param unitId

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

@@ -3,13 +3,8 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TaUserVerifyMapper;
-import com.community.huiju.dao.TpBuildingMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TaUserVerify;
-import com.community.huiju.model.TpBuilding;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpTransaction;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IBuildingOwnerInfo;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -29,19 +24,47 @@ import java.util.Map;
 @Service
 public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
 
+    /**
+     * 栋
+     */
     @Autowired
     private TpBuildingMapper tpBuildingMapper;
 
+    /**
+     * 户号 /  楼栋资料库
+     */
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    /**
+     * 期
+     */
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    /**
+     * 单元
+     */
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    /**
+     * 楼层
+     */
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+
     @Override
     public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
+        List<TpPhase> phaseList = tpPhaseMapper.selectByCommunityId(communityId);
+        List<TpBuilding> buildingList = tpBuildingMapper.selectByCommunityIdAndPhaseId(communityId, phaseId);
 
 
         responseBean.addSuccess(null);

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

@@ -876,8 +876,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Long pages = infoIPage.getPages();
 
 
-        // 行数 默认从 第 5 行开始
-        int currentRow = 5;
+        // 行数 默认从 第 3 行开始
+        int currentRow = 3;
         // 记录坐标
         int index = 0;