From f5539e2f8e35d7e53abf54409245c5c7f9d2a72a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 17 Jan 2024 19:32:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 3 +++
src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java | 5 +++++
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 32 +++++++++++++++++++++++++++++++-
3 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index 46564fd..be9278d 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -37,6 +37,9 @@
<if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
and jh.name like concat('%',#{gridWorkLog.name},'%')
</if>
+ <if test="gridWorkLog.houseCode !=null and gridWorkLog.houseCode!=''">
+ and jh.house_code = #{gridWorkLog.houseCode}
+ </if>
<if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
and jh.phone_number like concat('%',#{gridWorkLog.phone},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java b/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
index 94a49d3..999d6b5 100644
--- a/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
+++ b/src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java
@@ -86,4 +86,9 @@
*/
private String roleName;
+ /**
+ * 地址编码
+ */
+ private String houseCode;
+
}
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 81a1a44..0ab811e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -200,8 +200,38 @@
</select>
+ <!--房屋详情-->
+ <resultMap id="houseAndHouseLabelDetailMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
+ <result column="id" property="id"/>
+ <result column="house_code" property="houseCode"/>
+ <result column="district_code" property="districtCode"/>
+ <result column="district_name" property="districtName"/>
+ <result column="house_name" property="houseName"/>
+ <result column="phone" property="phone"/>
+ <result column="area" property="area"/>
+ <result column="property_price" property="propertyPrice"/>
+ <result column="service_due" property="serviceDue"/>
+ <result column="floor" property="floor"/>
+ <result column="building" property="building"/>
+ <result column="unit" property="unit"/>
+ <result column="room" property="room"/>
+ <result column="building_no" property="buildingNo"/>
+ <result column="image_urls" property="imageUrls"/>
+ <result column="create_user" property="createUser"/>
+ <result column="created_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="remark" property="remark"/>
+ <result column="is_deleted" property="isDeleted"/>
+ <collection property="userHouseLabelVOList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
+ <id property="id" column="cid"/>
+ <result property="remark" column="cremark"/>
+ </collection>
+ </resultMap>
+
<!--房屋自定义详情查询-->
- <select id="getHouseDetail" resultMap="houseAndHouseLabelMap">
+ <select id="getHouseDetail" resultMap="houseAndHouseLabelDetailMap">
select
jh.*,
jhl.id as cid,jhl.*,jhl.remark as cremark,
--
Gitblit v1.9.3