From c59eeba06fa3ff353cd7c9016aa0a0b25a6931a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 18:16:06 +0800
Subject: [PATCH] 商超查询，房屋查询，场所查询修改
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 29bd42c..8230739 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -345,7 +345,7 @@
}
// 户籍类型
if (!Strings.isBlank(houseAndHoldExcel.getResidentType())){
- householdEntity.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType()));
+ householdEntity.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType().trim()));
}
// 户籍地区县
if (!Strings.isBlank(houseAndHoldExcel.getResidentAdcode())){
@@ -423,6 +423,8 @@
UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
userHouseLabelEntity.setHouseholdId(householdEntity.getId());
+ // 设置默认的绿色
+ userHouseLabelEntity.setColor("#30D17C");
userHouseLabelEntity.setLableType(1);
userHouseLabelEntity.setLabelName(s);
userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
@@ -475,7 +477,7 @@
}
// 户籍类型
if (!Strings.isBlank(houseAndHoldExcel.getResidentType())){
- one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType()));
+ one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType().trim()));
}
// 户籍地区县
if (!Strings.isBlank(houseAndHoldExcel.getResidentAdcode())){
--
Gitblit v1.9.3