Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

房间号改为字字符串型，所在楼层、所在排 --renpc

Browse Source
This commit is contained in:
Renpc-kilig 2023-11-20 09:58:00 +08:00
parent e50874ebe4
commit 8b17c84314
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/cm/population/pojo/dtos/house/HouseDTO.java
View File

@ -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;
}

4
src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java
View File

@ -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());

18
src/main/resources/mybatis/mapper/house/house-mapper.xml
View File

@ -350,13 +350,13 @@
<if test="buildingName != null and buildingName != ''">
building_name = #{buildingName},
</if>
<if test="affiliationUnit != null">
<if test="affiliationUnit != null and affiliationUnit != ''">
affiliation_unit = #{affiliationUnit},
</if>
<if test="affiliationFloors != null">
<if test="affiliationFloors != null and affiliationFloors != ''">
affiliation_floors = #{affiliationFloors},
</if>
<if test="houseNum != null">
<if test="houseNum != null and houseNum != ''">
house_num = #{houseNum},
</if>
<if test="categoryId != null and categoryId != ''">
@ -749,13 +749,13 @@
<if test="buildingName != null and buildingName != ''">
AND building_name = #{buildingName}
</if>
<if test="affiliationUnit != null">
<if test="affiliationUnit != null and affiliationUnit != ''">
AND affiliation_unit = #{affiliationUnit}
</if>
<if test="affiliationFloors != null">
<if test="affiliationFloors != null and affiliationFloors != ''">
AND affiliation_floors = #{affiliationFloors}
</if>
<if test="houseNum != null">
<if test="houseNum != null and houseNum != ''">
AND house_num = #{houseNum}
</if>
<if test="isRental != null">
@ -1016,13 +1016,13 @@
<if test="buildingName != null and buildingName != ''">
AND building_name = #{buildingName}
</if>
<if test="affiliationUnit != null">
<if test="affiliationUnit != null and affiliationUnit != ''">
AND affiliation_unit = #{affiliationUnit}
</if>
<if test="affiliationFloors != null">
<if test="affiliationFloors != null and affiliationFloors != ''">
AND affiliation_floors = #{affiliationFloors}
</if>
<if test="houseNum != null">
<if test="houseNum != null and houseNum != ''">
AND house_num = #{houseNum}
</if>
<if test="isRental != null">