合并

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

@@ -23,14 +23,14 @@ public interface TpBuildingMapper {
     /**
      * 根据 小区/期/栋/单元/楼层/户号 进行条件查询
      * @param communityId
-     * @param phase
-     * @param building
-     * @param unit
-     * @param level
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
      * @param roomNo
      * @return
      */
-    List<TpBuilding> selectByAddress(Integer communityId,String phase,String building, String unit,String level,String roomNo);
+    List<TpBuilding> selectByAddress(Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,String roomNo);
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -9,16 +9,23 @@ public class TpBuildingOwnerInfo {
 
     private String idCard;
 
-    // 期
-    private String phase;
+    private Integer phaseId;
 
-    private String building;
+    private String phaseName;
 
-    private String unit;
+    private Integer buildingId;
 
-    private String level;
+    private String buildingName;
 
-    private String roomNo;
+    private Integer unitId;
+
+    private String unitName;
+
+    private Integer levelId;
+
+    private String levelName;
+
+    private String name;
 
     private String ownerName;
 
@@ -30,6 +37,8 @@ public class TpBuildingOwnerInfo {
 
     private String verifyStatus;
 
+    private String sort;
+
     private Integer createUser;
 
     private Date createDate;
@@ -59,47 +68,79 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setIdCard(String idCard) {
-        this.idCard = idCard == null ? null : idCard.trim();
+        this.idCard = idCard;
+    }
+
+    public Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
     }
 
-    public String getPhase() {
-        return phase;
+    public Integer getBuildingId() {
+        return buildingId;
     }
 
-    public void setPhase(String phase) {
-        this.phase = phase;
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
     }
 
-    public String getBuilding() {
-        return building;
+    public String getBuildingName() {
+        return buildingName;
     }
 
-    public void setBuilding(String building) {
-        this.building = building == null ? null : building.trim();
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
     }
 
-    public String getUnit() {
-        return unit;
+    public Integer getUnitId() {
+        return unitId;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit == null ? null : unit.trim();
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
     }
 
-    public String getLevel() {
-        return level;
+    public String getUnitName() {
+        return unitName;
     }
 
-    public void setLevel(String level) {
-        this.level = level == null ? null : level.trim();
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
     }
 
-    public String getRoomNo() {
-        return roomNo;
+    public Integer getLevelId() {
+        return levelId;
     }
 
-    public void setRoomNo(String roomNo) {
-        this.roomNo = roomNo == null ? null : roomNo.trim();
+    public void setLevelId(Integer levelId) {
+        this.levelId = levelId;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getOwnerName() {
@@ -107,7 +148,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setOwnerName(String ownerName) {
-        this.ownerName = ownerName == null ? null : ownerName.trim();
+        this.ownerName = ownerName;
     }
 
     public String getOwnerTel() {
@@ -115,7 +156,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setOwnerTel(String ownerTel) {
-        this.ownerTel = ownerTel == null ? null : ownerTel.trim();
+        this.ownerTel = ownerTel;
     }
 
     public String getGender() {
@@ -123,7 +164,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setGender(String gender) {
-        this.gender = gender == null ? null : gender.trim();
+        this.gender = gender;
     }
 
     public String getPairStatus() {
@@ -131,7 +172,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setPairStatus(String pairStatus) {
-        this.pairStatus = pairStatus == null ? null : pairStatus.trim();
+        this.pairStatus = pairStatus;
     }
 
     public String getVerifyStatus() {
@@ -139,7 +180,15 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
+        this.verifyStatus = verifyStatus;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
     }
 
     public Integer getCreateUser() {

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

@@ -15,24 +15,24 @@ public interface IBuildingOwnerInfo {
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
      * @param communityId
-     * @param phase
-     * @param building
-     * @param unit
-     * @param level
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
      * @param roomNo
      * @return
      */
-    ResponseBean selectBuildList(Integer communityId, String phase, String building, String unit, String level, String roomNo);
+    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo);
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
-     * @param phase
-     * @param building
-     * @param unit
-     * @param level
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
      * @param roomNo
      * @return
      */
-    ResponseBean hasBuild(UserElement userElement,String phase, String building, String unit, String level, String roomNo);
+    ResponseBean hasBuild(UserElement userElement,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo);
 
 }

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

@@ -39,19 +39,19 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
     private TaUserVerifyMapper taUserVerifyMapper;
 
     @Override
-    public ResponseBean selectBuildList(Integer communityId, String phase, String building, String unit, String level, String roomNo) {
+    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo) {
         ResponseBean responseBean = new ResponseBean();
 
-        List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(communityId, phase, building, unit, level, roomNo);
+        List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(communityId, phaseId, buildingId, unitId, levelId, roomNo);
         responseBean.addSuccess(buildingList);
         return responseBean;
     }
 
     @Override
-    public ResponseBean hasBuild(UserElement userElement,  String phase, String building, String unit, String level, String roomNo) {
+    public ResponseBean hasBuild(UserElement userElement,  Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, String roomNo) {
         ResponseBean responseBean = new ResponseBean();
         // 1.检验该用户关联有没有这个 户号
-        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phase, building, unit, level, roomNo);
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNo);
         if (null != taUserVerify) {
             responseBean.addError("您已关联此房产，无法再次关联！");
             return responseBean;

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

@@ -5,27 +5,33 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="id_card" property="idCard" jdbcType="VARCHAR" />
-    <result column="phase" property="phase" jdbcType="VARCHAR" />
-    <result column="building" property="building" jdbcType="VARCHAR" />
-    <result column="unit" property="unit" jdbcType="VARCHAR" />
-    <result column="level" property="level" jdbcType="VARCHAR" />
-    <result column="room_no" property="roomNo" jdbcType="VARCHAR" />
+    <result column="phase_id" property="phaseId" jdbcType="INTEGER" />
+    <result column="phase_name" property="phaseName" jdbcType="VARCHAR" />
+    <result column="building_id" property="buildingId" jdbcType="INTEGER" />
+    <result column="building_name" property="buildingName" jdbcType="VARCHAR" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="unit_name" property="unitName" jdbcType="VARCHAR" />
+    <result column="level_id" property="levelId" jdbcType="INTEGER" />
+    <result column="level_name" property="levelName" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
     <result column="owner_name" property="ownerName" jdbcType="VARCHAR" />
     <result column="owner_tel" property="ownerTel" jdbcType="VARCHAR" />
     <result column="gender" property="gender" jdbcType="CHAR" />
     <result column="pair_status" property="pairStatus" jdbcType="CHAR" />
     <result column="verify_status" property="verifyStatus" jdbcType="CHAR" />
+    <result column="sort" property="sort" jdbcType="VARCHAR" />
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, id_card, phase, building, unit, level, room_no, owner_name, owner_tel,
-    gender, pair_status, verify_status, create_user, create_date, update_user, update_date
+    id, community_id, id_card, phase_id, phase_name, building_id, building_name, unit_id,
+    unit_name, level_id, level_name, name, owner_name, owner_tel, gender, pair_status,
+    verify_status, sort, create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from tp_building_owner_info
     where id = #{id,jdbcType=INTEGER}
@@ -35,17 +41,21 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
-    insert into tp_building_owner_info (id, community_id, id_card, phase,
-      building, unit, level, 
-      room_no, owner_name, owner_tel, 
-      gender, pair_status, verify_status, 
-      create_user, create_date, update_user, 
+    insert into tp_building_owner_info (id, community_id, id_card,
+      phase_id, phase_name, building_id,
+      building_name, unit_id, unit_name,
+      level_id, level_name, name,
+      owner_name, owner_tel, gender,
+      pair_status, verify_status, sort,
+      create_user, create_date, update_user,
       update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
-      #{phase,jdbcType=VARCHAR}, #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR},
-      #{roomNo,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR}, #{ownerTel,jdbcType=VARCHAR}, 
-      #{gender,jdbcType=CHAR}, #{pairStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, 
-      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR},
+      #{phaseId,jdbcType=INTEGER}, #{phaseName,jdbcType=VARCHAR}, #{buildingId,jdbcType=INTEGER},
+      #{buildingName,jdbcType=VARCHAR}, #{unitId,jdbcType=INTEGER}, #{unitName,jdbcType=VARCHAR},
+      #{levelId,jdbcType=INTEGER}, #{levelName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
+      #{ownerName,jdbcType=VARCHAR}, #{ownerTel,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
+      #{pairStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{sort,jdbcType=VARCHAR},
+      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER},
       #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
@@ -60,20 +70,32 @@
       <if test="idCard != null" >
         id_card,
       </if>
-      <if test="phase != null">
-        phase,
+      <if test="phaseId != null" >
+        phase_id,
+      </if>
+      <if test="phaseName != null" >
+        phase_name,
+      </if>
+      <if test="buildingId != null" >
+        building_id,
       </if>
-      <if test="building != null" >
-        building,
+      <if test="buildingName != null" >
+        building_name,
       </if>
-      <if test="unit != null" >
-        unit,
+      <if test="unitId != null" >
+        unit_id,
       </if>
-      <if test="level != null" >
-        level,
+      <if test="unitName != null" >
+        unit_name,
       </if>
-      <if test="roomNo != null" >
-        room_no,
+      <if test="levelId != null" >
+        level_id,
+      </if>
+      <if test="levelName != null" >
+        level_name,
+      </if>
+      <if test="name != null" >
+        name,
       </if>
       <if test="ownerName != null" >
         owner_name,
@@ -90,6 +112,9 @@
       <if test="verifyStatus != null" >
         verify_status,
       </if>
+      <if test="sort != null" >
+        sort,
+      </if>
       <if test="createUser != null" >
         create_user,
       </if>
@@ -113,20 +138,32 @@
       <if test="idCard != null" >
         #{idCard,jdbcType=VARCHAR},
       </if>
-      <if test="phase != null">
-        #{phase,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        #{phaseId,jdbcType=INTEGER},
       </if>
-      <if test="building != null" >
-        #{building,jdbcType=VARCHAR},
+      <if test="phaseName != null" >
+        #{phaseName,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
-        #{unit,jdbcType=VARCHAR},
+      <if test="buildingId != null" >
+        #{buildingId,jdbcType=INTEGER},
       </if>
-      <if test="level != null" >
-        #{level,jdbcType=VARCHAR},
+      <if test="buildingName != null" >
+        #{buildingName,jdbcType=VARCHAR},
       </if>
-      <if test="roomNo != null" >
-        #{roomNo,jdbcType=VARCHAR},
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="unitName != null" >
+        #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="levelId != null" >
+        #{levelId,jdbcType=INTEGER},
+      </if>
+      <if test="levelName != null" >
+        #{levelName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
       </if>
       <if test="ownerName != null" >
         #{ownerName,jdbcType=VARCHAR},
@@ -143,6 +180,9 @@
       <if test="verifyStatus != null" >
         #{verifyStatus,jdbcType=CHAR},
       </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null" >
         #{createUser,jdbcType=INTEGER},
       </if>
@@ -166,20 +206,32 @@
       <if test="idCard != null" >
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
-      <if test="phase != null">
-        phase = #{phase,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        phase_id = #{phaseId,jdbcType=INTEGER},
       </if>
-      <if test="building != null" >
-        building = #{building,jdbcType=VARCHAR},
+      <if test="phaseName != null" >
+        phase_name = #{phaseName,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
-        unit = #{unit,jdbcType=VARCHAR},
+      <if test="buildingId != null" >
+        building_id = #{buildingId,jdbcType=INTEGER},
       </if>
-      <if test="level != null" >
-        level = #{level,jdbcType=VARCHAR},
+      <if test="buildingName != null" >
+        building_name = #{buildingName,jdbcType=VARCHAR},
       </if>
-      <if test="roomNo != null" >
-        room_no = #{roomNo,jdbcType=VARCHAR},
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="unitName != null" >
+        unit_name = #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="levelId != null" >
+        level_id = #{levelId,jdbcType=INTEGER},
+      </if>
+      <if test="levelName != null" >
+        level_name = #{levelName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
       </if>
       <if test="ownerName != null" >
         owner_name = #{ownerName,jdbcType=VARCHAR},
@@ -196,6 +248,9 @@
       <if test="verifyStatus != null" >
         verify_status = #{verifyStatus,jdbcType=CHAR},
       </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null" >
         create_user = #{createUser,jdbcType=INTEGER},
       </if>
@@ -215,16 +270,21 @@
     update tp_building_owner_info
     set community_id = #{communityId,jdbcType=INTEGER},
       id_card = #{idCard,jdbcType=VARCHAR},
-      phase = #{phase,jdbcType=VARCHAR},
-      building = #{building,jdbcType=VARCHAR},
-      unit = #{unit,jdbcType=VARCHAR},
-      level = #{level,jdbcType=VARCHAR},
-      room_no = #{roomNo,jdbcType=VARCHAR},
+      phase_id = #{phaseId,jdbcType=INTEGER},
+      phase_name = #{phaseName,jdbcType=VARCHAR},
+      building_id = #{buildingId,jdbcType=INTEGER},
+      building_name = #{buildingName,jdbcType=VARCHAR},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      unit_name = #{unitName,jdbcType=VARCHAR},
+      level_id = #{levelId,jdbcType=INTEGER},
+      level_name = #{levelName,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
       owner_name = #{ownerName,jdbcType=VARCHAR},
       owner_tel = #{ownerTel,jdbcType=VARCHAR},
       gender = #{gender,jdbcType=CHAR},
       pair_status = #{pairStatus,jdbcType=CHAR},
       verify_status = #{verifyStatus,jdbcType=CHAR},
+      sort = #{sort,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
@@ -240,20 +300,32 @@
       <if test="idCard != null" >
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
-      <if test="phase != null">
-        phase = #{phase,jdbcType=VARCHAR},
+      <if test="phaseId != null" >
+        phase_id = #{phaseId,jdbcType=INTEGER},
       </if>
-      <if test="building != null" >
-        building = #{building,jdbcType=VARCHAR},
+      <if test="phaseName != null" >
+        phase_name = #{phaseName,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
-        unit = #{unit,jdbcType=VARCHAR},
+      <if test="buildingId != null" >
+        building_id = #{buildingId,jdbcType=INTEGER},
       </if>
-      <if test="level != null" >
-        level = #{level,jdbcType=VARCHAR},
+      <if test="buildingName != null" >
+        building_name = #{buildingName,jdbcType=VARCHAR},
       </if>
-      <if test="roomNo != null" >
-        room_no = #{roomNo,jdbcType=VARCHAR},
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="unitName != null" >
+        unit_name = #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="levelId != null" >
+        level_id = #{levelId,jdbcType=INTEGER},
+      </if>
+      <if test="levelName != null" >
+        level_name = #{levelName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
       </if>
       <if test="ownerName != null" >
         owner_name = #{ownerName,jdbcType=VARCHAR},
@@ -270,6 +342,9 @@
       <if test="verifyStatus != null" >
         verify_status = #{verifyStatus,jdbcType=CHAR},
       </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null" >
         create_user = #{createUser,jdbcType=INTEGER},
       </if>

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

@@ -10,12 +10,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.OutputStream;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -193,4 +197,25 @@ public class BuildingOwnerInfoController extends BaseController {
         ResponseBean responseBean = iBuildingOwnerInfoService.communitybuildingUpdate(parameter, userElement.getCommunityId());
         return responseBean;
     }
+
+    @ApiOperation(value = "下载Excel模板(小区楼栋信息)", notes = "下载Excel模板(小区楼栋信息)")
+    @ApiImplicitParams({
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/building/downloadExcel", method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response, HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(userElement).getData();
+        this.setResponseHeader(response, "业主资料库.xlsx");
+        //响应到客户端
+        try {
+            OutputStream os = response.getOutputStream();
+            workbook.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,6 +35,9 @@ public class TpBuilding implements Serializable {
      * 楼栋名称
      */
     private String name;
-
-
+    
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
 }

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -67,6 +68,9 @@ public class TpLevel implements Serializable {
      * 楼层名称
      */
     private String name;
-
-
+    
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
 }

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -37,6 +38,9 @@ public class TpPhase implements Serializable {
      * 期区名称
      */
     private String name;
-
-
+    
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
 }

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -57,6 +58,9 @@ public class TpUnit implements Serializable {
      * 单元名称
      */
     private String name;
-
-
+    
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
 }

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

@@ -111,4 +111,11 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean communitybuildingUpdate(String parameter, Integer communityId);
+
+    /**
+     * 下载Excel模板(小区楼栋信息)
+     * @param userElement
+     * @return
+     */
+    ResponseBean downloadExcel(UserElement userElement);
 }

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

@@ -1,10 +1,9 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,15 +20,12 @@ import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.community.huiju.service.ITaUserService;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,6 +35,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -89,7 +87,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(TpBuildingOwnerInfo.class);
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = jsonObject.toJavaObject(jsonObject,TpBuildingOwnerInfo.class);
 
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
@@ -845,4 +843,87 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         return selectBuild;
     }
+
+    @Override
+    public ResponseBean downloadExcel(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        InputStream inputStream = null;
+        inputStream = this.getClass().getResourceAsStream("/业主资料库.xlsx");
+
+        XSSFWorkbook workbook = null;
+        try {
+            workbook = new XSSFWorkbook(inputStream);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        XSSFSheet sheet = workbook.getSheetAt(0);
+        // 创建行
+        XSSFRow row = null;
+        // 创建列
+        XSSFCell cell = null;
+
+        Integer pageNum = 1;
+        Integer pageSize = 10;
+        Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
+        // 分页查询
+        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
+        buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
+        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
+        List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
+        // 总页数
+        Long pages = infoIPage.getPages();
+
+
+        // 行数 默认从 第 5 行开始
+        int currentRow = 5;
+        // 记录坐标
+        int index = 0;
+
+        // 样式
+        XSSFCellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setBorderBottom(XSSFCellStyle.BORDER_THIN); //下边框
+        cellStyle.setBorderLeft(XSSFCellStyle.BORDER_THIN);//左边框
+        cellStyle.setBorderTop(XSSFCellStyle.BORDER_THIN);//上边框
+        cellStyle.setBorderRight(XSSFCellStyle.BORDER_THIN);//右边框
+        cellStyle.setAlignment(HorizontalAlignment.LEFT);
+
+        if (records.size() > 0) {
+            do {
+                TpBuildingOwnerInfo buildingOwnerInfo = records.get(index);
+                row = sheet.createRow(currentRow);
+                String address = buildingOwnerInfo.getPhaseName() +
+                        buildingOwnerInfo.getBuildingName() +
+                        buildingOwnerInfo.getUnitName() +
+                        buildingOwnerInfo.getLevelName() +
+                        buildingOwnerInfo.getName();
+
+                cell = row.createCell(0);
+                cell.setCellValue(address);
+                cell.setCellStyle(cellStyle);
+                cell = row.createCell(1);
+                cell.setCellValue(buildingOwnerInfo.getId());
+                cell.setCellStyle(cellStyle);
+                cell = row.createCell(2);
+                cell.setCellStyle(cellStyle);
+                cell = row.createCell(3);
+                cell.setCellStyle(cellStyle);
+                cell = row.createCell(4);
+                cell.setCellStyle(cellStyle);
+
+                currentRow ++;
+                index ++;
+                if (index == records.size()) {
+                    index = 0;
+                    page = new Page(infoIPage.getCurrent() + 1,pageSize);
+                    infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
+                    records = infoIPage.getRecords();
+                }
+            } while (infoIPage.getCurrent() <= pages);
+        }
+
+        responseBean.addSuccess(workbook);
+        return responseBean;
+    }
 }

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

@@ -200,6 +200,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		if (treeType.equals("phase")){
 			QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",communityId);
+			queryWrapper.orderByAsc("create_date");
 			List<TpPhase> list = tpPhaseMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
 				Map<String,Object> map = new HashMap<>();
@@ -212,6 +213,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			QueryWrapper<TpBuilding> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",communityId);
 			queryWrapper.eq("phase_id",id);
+			queryWrapper.orderByAsc("create_date");
 			List<TpBuilding> list = tpBuildingMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
 				Map<String,Object> map = new HashMap<>();
@@ -224,6 +226,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			QueryWrapper<TpUnit> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",communityId);
 			queryWrapper.eq("building_id",id);
+			queryWrapper.orderByAsc("create_date");
 			List<TpUnit> list = tpUnitMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
 				Map<String,Object> map = new HashMap<>();
@@ -236,6 +239,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			QueryWrapper<TpLevel> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",communityId);
 			queryWrapper.eq("unit_id",id);
+			queryWrapper.orderByAsc("create_date");
 			List<TpLevel> list = tpLevelMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
 				Map<String,Object> map = new HashMap<>();
@@ -248,6 +252,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",communityId);
 			queryWrapper.eq("level_id",id);
+			queryWrapper.orderByAsc("create_date");
 			List<TpBuildingOwnerInfo> list = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
 			list.stream().forEach(e -> {
 				Map<String,Object> map = new HashMap<>();
@@ -280,6 +285,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				TpPhase tpPhase = new TpPhase();
 				tpPhase.setName(tpBuildingOwnerInfo.getPhaseName());
 				tpPhase.setCommunityId(communityId);
+				tpPhase.setCreateDate(LocalDateTime.now());
 				tpPhaseMapper.insert(tpPhase);
 				//重置Last
 				lastPhaseName = tpBuildingOwnerInfo.getPhaseName();
@@ -296,6 +302,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuilding.setPhaseId(lastPhaseId);
 				tpBuilding.setPhaseName(lastPhaseName);
 				tpBuilding.setName(tpBuildingOwnerInfo.getBuildingName());
+				tpBuilding.setCreateDate(LocalDateTime.now());
 				tpBuildingMapper.insert(tpBuilding);
 				lastBuildingName = tpBuildingOwnerInfo.getBuildingName();
 				lastBuildingId = tpBuilding.getId();
@@ -309,6 +316,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpUnit.setBuildingId(lastBuildingId);
 				tpUnit.setBuildingName(lastBuildingName);
 				tpUnit.setName(tpBuildingOwnerInfo.getUnitName());
+				tpUnit.setCreateDate(LocalDateTime.now());
 				tpUnitMapper.insert(tpUnit);
 				lastUnitName = tpBuildingOwnerInfo.getUnitName();
 				lastUnitId = tpUnit.getId();
@@ -324,6 +332,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpLevel.setUnitId(lastUnitId);
 				tpLevel.setUnitName(lastUnitName);
 				tpLevel.setName(tpBuildingOwnerInfo.getLevelName());
+				tpLevel.setCreateDate(LocalDateTime.now());
 				tpLevelMapper.insert(tpLevel);
 				lastLevelName = tpBuildingOwnerInfo.getLevelName();
 				lastLevelId = tpLevel.getId();
@@ -341,6 +350,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuildingOwnerInfoNew.setLevelId(lastLevelId);
 				tpBuildingOwnerInfoNew.setLevelName(lastLevelName);
 				tpBuildingOwnerInfoNew.setName(tpBuildingOwnerInfo.getName());
+				tpBuildingOwnerInfoNew.setCreateDate(LocalDateTime.now());
 				tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfoNew);
 			}
 		}

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

@@ -164,3 +164,12 @@ export function communityBuildingAdd(data) {
     }
   })
 }
+
+// 下载excel模板
+export function buildingDownloadExcel() {
+  return request({
+    url: '/building/downloadExcel',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

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

@@ -1,5 +1,5 @@
 
-import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse,communityBuildingAdd } from '@/api/buildingOwnerInfo'
+import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel } from '@/api/buildingOwnerInfo'
 
 const buildingOwnerInfo = {
   state: {
@@ -113,6 +113,15 @@ const buildingOwnerInfo = {
           reject(error)
         })
       })
+    },
+    BuildingDownloadExcel({ commit }) { // 下载模板
+      return new Promise((resolve, reject) => {
+        buildingDownloadExcel().then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -4,7 +4,8 @@
     <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>
-          <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"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
+          <!-- <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>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>
@@ -142,6 +143,19 @@ export default {
     },
     dialogBuildingIndex() {
       this.$router.push({ name: "building-index" });
+    },
+    exportExcel() {
+      this.$store.dispatch('BuildingDownloadExcel').then(res => {
+        const url = window.URL.createObjectURL(new Blob([res]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        link.setAttribute('download', '业主资料库.xlsx')
+        document.body.appendChild(link)
+        link.click()
+      }).catch(() => {
+        console.log('error BuildingDownloadExcel')
+      })
     }
   }
 };