From 8b17c84314a61cb195025f28383fbe985192e1b6 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Mon, 20 Nov 2023 09:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=8F=B7=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E5=AD=97=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=9E=8B=EF=BC=8C=E6=89=80?=
=?UTF-8?q?=E5=9C=A8=E6=A5=BC=E5=B1=82=E3=80=81=E6=89=80=E5=9C=A8=E6=8E=92?=
=?UTF-8?q?=20=20--renpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../population/pojo/dtos/house/HouseDTO.java | 19 +++++++++----------
.../service/house/impl/HouseServiceImpl.java | 4 ++--
.../mybatis/mapper/house/house-mapper.xml | 18 +++++++++---------
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java b/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
index 0773c60..5fb1add 100644
--- a/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
+++ b/src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
@@ -32,15 +32,15 @@ public class HouseDTO {
@ApiModelProperty(name = "buildingName", value = "楼/排名称")
private String buildingName;
@ApiModelProperty(name = "affiliationUnit", value = "所在单元/列")
- private Integer affiliationUnit;
+ private String affiliationUnit;
@ApiModelProperty(name = "unitNum", value = "单元/排数")
private String unitNum;
@ApiModelProperty(name = "affiliationFloors", value = "所在层/院")
- private Integer affiliationFloors;
+ private String affiliationFloors;
@ApiModelProperty(name = "floorsNum", value = "楼层数")
private String floorsNum;
@ApiModelProperty(name = "houseNum", value = "门牌号")
- private Integer houseNum;
+ private String houseNum;
@ApiModelProperty(name = "categoryId", value = "房屋类别")
private String categoryId;
@ApiModelProperty(name = "categoryName", value = "房屋类别名称")
@@ -186,20 +186,19 @@ public class HouseDTO {
this.buildingName = buildingName;
}
- public Integer getAffiliationUnit() {
+ public String getAffiliationUnit() {
return affiliationUnit;
}
- public void setAffiliationUnit(Integer affiliationUnit) {
+ public void setAffiliationUnit(String affiliationUnit) {
this.affiliationUnit = affiliationUnit;
}
-
- public Integer getAffiliationFloors() {
+ public String getAffiliationFloors() {
return affiliationFloors;
}
- public void setAffiliationFloors(Integer affiliationFloors) {
+ public void setAffiliationFloors(String affiliationFloors) {
this.affiliationFloors = affiliationFloors;
}
@@ -219,11 +218,11 @@ public class HouseDTO {
this.floorsNum = floorsNum;
}
- public Integer getHouseNum() {
+ public String getHouseNum() {
return houseNum;
}
- public void setHouseNum(Integer houseNum) {
+ public void setHouseNum(String houseNum) {
this.houseNum = houseNum;
}
diff --git a/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java b/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
index f27bf59..ece7c54 100644
--- a/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
+++ b/src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
@@ -292,9 +292,9 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
for (HouseDTO houseDTO : houseDTOList) {
BatchHouseDTO.House house = new BatchHouseDTO.House();
if (null != houseDTO.getAffiliationFloors()) {
- if (i == houseDTO.getAffiliationFloors()) {
+ if (i == Integer.valueOf(houseDTO.getAffiliationFloors())) {
if (null != houseDTO.getAffiliatedUnit()) {
- if (j == houseDTO.getAffiliationUnit()) {
+ if (j == Integer.valueOf(houseDTO.getAffiliationUnit())) {
house.setIsCreator(0);
house.setPopulationCount(0);
house.setHouseId(houseDTO.getHouseId());
diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml
index b096baf..734dfc3 100644
--- a/src/main/resources/mybatis/mapper/house/house-mapper.xml
+++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml
@@ -350,13 +350,13 @@
building_name = #{buildingName},
-
+
affiliation_unit = #{affiliationUnit},
-
+
affiliation_floors = #{affiliationFloors},
-
+
house_num = #{houseNum},
@@ -749,13 +749,13 @@
AND building_name = #{buildingName}
-
+
AND affiliation_unit = #{affiliationUnit}
-
+
AND affiliation_floors = #{affiliationFloors}
-
+
AND house_num = #{houseNum}
@@ -1016,13 +1016,13 @@
AND building_name = #{buildingName}
-
+
AND affiliation_unit = #{affiliationUnit}
-
+
AND affiliation_floors = #{affiliationFloors}
-
+
AND house_num = #{houseNum}