购买房屋

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentHouseDTO.java

@@ -190,6 +190,6 @@ public class RentHouseDTO implements Serializable {
     /**
      * 是否更新
      */
-    private String flag;
+    private Boolean needUpdate;
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/excel/RentHouseExcel.java

@@ -3,9 +3,6 @@ package com.epmet.plugin.power.modules.rent.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 房屋信息
  *
@@ -15,37 +12,25 @@ import java.util.Date;
 @Data
 public class RentHouseExcel {
 
-    @Excel(name = "房屋主键")
-    private String id;
-
-    @Excel(name = "客户id")
-    private String customerId;
-
-    @Excel(name = "小区id")
-    private String neighborHoodId;
-
-    @Excel(name = "片区id，neighbor_hood_part.id,可为空。")
-    private String partId;
-
-    @Excel(name = "所属楼栋id")
-    private String buildingId;
+    @Excel(name = "所属小区")
+    private String villageName;
 
-    @Excel(name = "所属单元id")
-    private String buildingUnitId;
+    @Excel(name = "所属楼栋")
+    private String buildName;
 
-    @Excel(name = "房屋名字后台插入时生成")
-    private String houseName;
+    @Excel(name = "单元号")
+    private String unitName;
 
     @Excel(name = "门牌号")
-    private String doorName;
+    private String homeName;
 
-    @Excel(name = "房屋类型，1楼房，2平房，3别墅")
+    @Excel(name = "类型", replace = {"楼房_1", "平房_2", "别墅_3"})
     private String houseType;
 
-    @Excel(name = "存储字典value")
+    @Excel(name = "用途", replace = {"住宅_1", "商业_2", "办公_3", "工业_4", "仓储_5", "商住混用_6", "其他_7"})
     private String purpose;
 
-    @Excel(name = "1：出租 0：自住  2：闲置")
+    @Excel(name = "房屋状态", replace = {"出租_1", "闲置_2", "自住_0"})
     private Integer rentFlag;
 
     @Excel(name = "房主姓名")
@@ -54,68 +39,7 @@ public class RentHouseExcel {
     @Excel(name = "房主电话")
     private String ownerPhone;
 
-    @Excel(name = "房主身份证号")
+    @Excel(name = "房主身份证")
     private String ownerIdCard;
 
-    @Excel(name = "排序")
-    private BigDecimal sort;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-    @Excel(name = "社区ID")
-    private String communityId;
-
-    @Excel(name = "社区")
-    private String communityName;
-
-    @Excel(name = "网格ID")
-    private String gridId;
-
-    @Excel(name = "网格")
-    private String gridName;
-
-    @Excel(name = "房屋小区ID")
-    private String villageId;
-
-    @Excel(name = "房屋小区")
-    private String villageName;
-
-    @Excel(name = "楼号ID")
-    private String buildId;
-
-    @Excel(name = "楼号")
-    private String buildName;
-
-    @Excel(name = "单元ID")
-    private String unitId;
-
-    @Excel(name = "单元")
-    private String unitName;
-
-    @Excel(name = "房屋ID")
-    private String homeId;
-
-    @Excel(name = "房屋")
-    private String homeName;
-
-    @Excel(name = "购房日期")
-    private String purchaseDate;
-
-
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java

@@ -97,7 +97,7 @@ public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHous
         insert(entity);
 
         // 更新房屋的租赁状态
-        if (dto.getFlag() == "123") {
+        if (dto.getNeedUpdate()) {
             IcHouseAddFormDTO formDTO = ConvertUtils.sourceToTarget(dto, IcHouseAddFormDTO.class);
             govOrgOpenFeignClient.houseUpdate(formDTO);
         }