From fc8c3aba33c00e2ccde513c29da7b3762231c615 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 14 May 2024 15:11:36 +0800
Subject: [PATCH] 维修基金优化
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 31 +++++++++++++++++++++++++++----
src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java | 5 +++++
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 12 ++++++++++++
3 files changed, 44 insertions(+), 4 deletions(-)
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 55c4762..7f251b8 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -57,15 +57,38 @@
<!--自定义分页查询-->
<select id="selectDoorplateAddressPage" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
- select * from jczz_doorplate_address where 1=1
+ SELECT
+ jda.*
+ FROM
+ jczz_doorplate_address jda LEFT JOIN jczz_district jd on jda.aoi_code=jd.aoi_code
+ where 1=1
<if test="doorplateAddress.aoiName!=null and doorplateAddress.aoiName!=''">
- and aoi_name like concat('%',#{doorplateAddress.aoiName},'%')
+ and jda.aoi_name like concat('%',#{doorplateAddress.aoiName},'%')
</if>
<if test="doorplateAddress.addressName!=null and doorplateAddress.addressName!=''">
- and address_name like concat('%',#{doorplateAddress.addressName},'%')
+ and jda.address_name like concat('%',#{doorplateAddress.addressName},'%')
</if>
<if test="doorplateAddress.townStreetCode != null and doorplateAddress.townStreetCode != ''">
- and town_street_code like concat('%',#{doorplateAddress.townStreetCode},'%')
+ and jda.town_street_code like concat('%',#{doorplateAddress.townStreetCode},'%')
+ </if>
+
+ <if test="doorplateAddress.houseName != null and doorplateAddress.houseName != ''">
+ and jda.house_name like concat('%',#{doorplateAddress.houseName},'%')
+ </if>
+
+ <if test="doorplateAddress.buildingName != null and doorplateAddress.buildingName != ''">
+ and jda.building_name like concat('%',#{doorplateAddress.buildingName},'%')
+ </if>
+
+ <if test="doorplateAddress.unitName != null and doorplateAddress.unitName != ''">
+ and jda.unit_name like concat('%',#{doorplateAddress.unitName},'%')
+ </if>
+
+ <if test="doorplateAddress.districtIds != null ">
+ and jd.id in
+ <foreach collection="doorplateAddress.districtIds" item="districtId" separator ="," open="(" close=")">
+ #{districtId}
+ </foreach>
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
index 12dfabc..89fd967 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
@@ -1,5 +1,6 @@
package org.springblade.modules.doorplateAddress.vo;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -62,5 +63,9 @@
*/
private Integer lableCode;
+ @ApiModelProperty(value = "小区id 集合")
+
+ private List<String> districtIds;
+
}
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 0a3fd99..0618674 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -219,4 +219,16 @@
@ApiModelProperty(value = "楼栋号（名称）")
private String buildingName;
+ /**
+ * 户室号集合
+ */
+ @ApiModelProperty(value = "户室号集合")
+ private String houseNames;
+
+ /**
+ * 地址编码集合
+ */
+ @ApiModelProperty(value = "地址编码集合")
+ private String addressCodes;
+
}
--
Gitblit v1.9.3