From ef7cd47d16223b70a83652e723bb9ae1740f4675 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 06 Mar 2024 10:31:27 +0800
Subject: [PATCH] 项目分摊方式隐藏，修改为楼栋选择
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 16 ++++++++
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 7 +++
src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java | 7 +++
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 10 +++++
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 11 +++++
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 11 +++++
src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java | 1
7 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 6a19c82..76ee61a 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -255,4 +255,15 @@
return R.data(doorplateAddressService.getPlaceList(doorplateAddressVO,size));
}
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId 门牌地址编号
+ * @return
+ */
+ @GetMapping("/getHouseBuildingCode")
+ public R<List<DoorplateAddressVO>> getHouseBuildingCode(String districtId) {
+ List<DoorplateAddressVO> houseBuildingCode = doorplateAddressService.getHouseBuildingCode(districtId);
+ return R.data(houseBuildingCode);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
index 84b9c38..bf26270 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
@@ -291,5 +291,4 @@
*/
@ApiModelProperty(value = "警务网格编码")
private String jwwgCode;
-
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
index a3715fc..54e1017 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -224,4 +224,11 @@
* @return
*/
List<DoorplateAddressEntity> getAllCommunityList();
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId
+ * @return
+ */
+ List<DoorplateAddressVO> getHouseBuildingCode(String districtId);
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index d7e8e9b..fa1c703 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -654,4 +654,20 @@
jda.nei_name,
jda.town_street_code
</select>
+
+
+ <select id="getHouseBuildingCode"
+ resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
+
+ SELECT DISTINCT
+ jda.building_code,
+ jda.building_name
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_district jd ON jd.aoi_code = jda.aoi_code
+ WHERE
+ jd.id = #{districtId}
+ and jda.building_code is not null
+
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java b/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
index 96b2c30..fd024ec 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
@@ -130,4 +130,11 @@
* @return
*/
Object getPlaceList(DoorplateAddressVO doorplateAddressVO, Integer size);
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId
+ * @return
+ */
+ List<DoorplateAddressVO> getHouseBuildingCode(String districtId);
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index f8ef660..cd1c694 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -956,4 +956,14 @@
commonParamSet.getIsAdministrator()
);
}
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId
+ * @return
+ */
+ @Override
+ public List<DoorplateAddressVO> getHouseBuildingCode(String districtId) {
+ return baseMapper.getHouseBuildingCode(districtId);
+ }
}
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index 66ad5b9..c8858ef 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -204,4 +204,15 @@
private Integer articleId;
+ /**
+ * 楼栋编码
+ */
+ @ApiModelProperty(value = "楼栋编码")
+ private String buildingCode;
+ /**
+ * 楼栋号（名称）
+ */
+ @ApiModelProperty(value = "楼栋号（名称）")
+ private String buildingName;
+
}
--
Gitblit v1.9.3