From 22cc7c450786395674e0199aa96a68c25f78259f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 16 Jun 2022 17:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=B7=BB=E5=8A=A0=203:?= =?UTF-8?q?=E6=9C=AA=E5=87=BA=E5=94=AE=20=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 2 +- .../com/epmet/dto/form/IcHouseAddFormDTO.java | 2 +- .../com/epmet/dto/form/IcHouseListFormDTO.java | 2 +- .../epmet/dto/result/HouseChartResultDTO.java | 2 +- .../com/epmet/enums/HouseRentFlagEnums.java | 5 +++-- .../java/com/epmet/entity/IcHouseEntity.java | 2 +- .../epmet/model/ImportHouseInfoListener.java | 6 ++++-- .../epmet/service/impl/IcHouseServiceImpl.java | 18 +++--------------- .../src/main/resources/mapper/IcHouseDao.xml | 2 ++ 9 files changed, 17 insertions(+), 24 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 1bfeb17521..ca5408d581 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -98,7 +98,7 @@ public class ImportGeneralDTO implements Serializable { private String purpose; /** - * 房屋状态 1：出租 0：自住 2：闲置 + * 房屋状态 1：出租 0：自住 2：闲置 3:未出售 */ private String rentFlagString; private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java index 8882060a2e..a07f4fe886 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java @@ -81,7 +81,7 @@ public class IcHouseAddFormDTO implements Serializable { private String purpose; /** - * 1：出租 0：自住 2：闲置 + * 1：出租 0：自住 2：闲置 3: 未出售 */ @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index 0e2e25a049..bfff2b0709 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -48,7 +48,7 @@ public class IcHouseListFormDTO extends PageFormDTO { */ private String ownerPhone; /** - * 房屋状态 【1：出租 0：自住 2：闲置】 + * 房屋状态 【1：出租 0：自住 2：闲置 3:未出售】 */ private String rentFlag; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java index 7a4e974162..aed43f1b0c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java @@ -50,7 +50,7 @@ public class HouseChartResultDTO implements Serializable { @JsonIgnore private Integer num; - //1：出租 0：自住 2：闲置 + //1：出租 0：自住 2：闲置 3:未出售 @JsonIgnore private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java index 27cd699bf3..32337f847d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java @@ -8,7 +8,8 @@ public enum HouseRentFlagEnums { NO(0,"否");*/ HOUSE_ZZ(0,"自住"), HOUSE_CZ(1,"出租"), - HOUSE_XZ(2,"闲置"); + HOUSE_XZ(2,"闲置"), + HOUSE_WCS(3,"未出售"); @@ -41,7 +42,7 @@ public enum HouseRentFlagEnums { public static Integer getCodeByName(String name){ if(StringUtils.isEmpty(name)){ - return 0; + return null; } for (HouseRentFlagEnums e : HouseRentFlagEnums.values()) { if (e.getName().equals(name)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 5940608292..a535667426 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -83,7 +83,7 @@ public class IcHouseEntity extends BaseEpmetEntity { private String purpose; /** - * 1出租；0未出租 + * 1：出租 0：自住 2：闲置 3：未出售 */ private Integer rentFlag; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index b070543014..2d9bb999e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -191,12 +191,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener categories = new ArrayList<>(); if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) { for (IcResiCategoryStatsConfigDTO category : categoryList) { @@ -302,4 +290,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl