房屋导入模板

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -196,6 +196,8 @@ public interface Constants {
     String USE_REMISES = "use_remises";
     //字典值 房屋状态
     String HOUSE_STATUS = "house_status";
+    //字典值 房屋类型
+    String HOUSE_TYPE = "house_type";
     //字典值 性别
     String GENDER = "gender";
     //字典值 与户主的关系

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/houseInfo/vo/HouseInfoVoDr.java

@@ -38,6 +38,12 @@ public class HouseInfoVoDr implements Serializable {
     @Excel(name = "权利人姓名")
     private String ownerName;
 
+    /**
+     * 房屋类型 1=普通住房,2=洋房
+     */
+    @Excel(name = "房屋类型")
+    private String houseType;
+
     /**
      * 房屋坐落位置
      */
@@ -98,10 +104,28 @@ public class HouseInfoVoDr implements Serializable {
     @Excel(name = "共有人姓名，多个共有人可以用逗号分隔")
     private String coOwner;
 
+    /**
+     * 楼栋
+     */
+    @Excel(name = "楼栋", type = Excel.Type.IMPORT)
+    private String ld;
+
+    /**
+     * 单元
+     */
+    @Excel(name = "单元", type = Excel.Type.IMPORT)
+    private String dy;
+
+    /**
+     * 门牌号
+     */
+    @Excel(name = "门牌号", type = Excel.Type.IMPORT)
+    private String mph;
+
     /**
      * 房屋的详细门牌号
      */
-    @Excel(name = "房屋的详细门牌号")
+    @Excel(name = "房屋的详细门牌号", type = Excel.Type.EXPORT)
     private String detailedAddress;
 
     /**

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/HouseInfoServiceImpl.java

@@ -195,8 +195,11 @@ public class HouseInfoServiceImpl implements IHouseInfoService {
                     extracted(TYPES_RIGHTS,houseInfo);
                     extracted(USE_REMISES,houseInfo);
                     extracted(HOUSE_STATUS,houseInfo);
+                    extracted(HOUSE_TYPE,houseInfo);
 
-
+                    StringBuilder sb = new StringBuilder();
+                    sb.append(houseInfo.getLd()).append("栋").append(houseInfo.getDy()).append("单元").append(houseInfo.getMph());
+                    houseInfo.setDetailedAddress(sb.toString());
                     HouseInfo add = MapstructUtils.convert(houseInfo, HouseInfo.class);
                     add.setCreateTime(DateUtils.getNowDate());
                     baseMapper.insert(add);
@@ -250,6 +253,12 @@ public class HouseInfoServiceImpl implements IHouseInfoService {
                 }
             }
 
+            if(HOUSE_TYPE.equals(type)){
+                if(sysDictDataVo.getDictLabel().equals(houseInfo.getHouseType())){
+                    houseInfo.setHouseType(sysDictDataVo.getDictValue());
+                }
+            }
+
         }
     }