From d2065182415f95147fc4ba0bed23e373434b7d97 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 Nov 2023 09:33:10 +0800
Subject: [PATCH] 标签，房屋，住户管理
---
src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml | 28 +++++++++++++
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 53 ++++++++++++++++++++++++++
2 files changed, 79 insertions(+), 2 deletions(-)
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 3c49f26..edb7604 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -27,6 +27,34 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <sql id="selectHouse">
+ select
+ id,
+ house_code,
+ district_code,
+ district_name,
+ house_name,
+ phone,
+ area,
+ property_price,
+ service_due,
+ floor,
+ building,
+ unit,
+ room,
+ building_no,
+ image_urls,
+ create_user,
+ create_time,
+ update_user,
+ update_time,
+ remark,
+ is_deleted
+ from
+ jczz_house
+ </sql>
+
+
<!--房屋详情-->
<resultMap id="houseAndHouseLabelMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
<id property="id" column="id"/>
@@ -39,7 +67,30 @@
<!--自定义分页列表-->
<select id="selectHousePage" resultMap="houseResultMap">
- select * from jczz_house where is_deleted = 0
+ <include refid="selectHouse"/>
+ <where>
+ <if test="house.id != null "> and id = #{house.id}</if>
+ <if test="house.houseCode != null and house.houseCode != ''"> and house_code = #{house.houseCode}</if>
+ <if test="house.districtCode != null and house.districtCode != ''"> and district_code = #{house.districtCode}</if>
+ <if test="house.districtName != null and house.districtName != ''"> and district_name = #{house.districtName}</if>
+ <if test="house.houseName != null and house.houseName != ''"> and house_name = #{house.houseName}</if>
+ <if test="house.phone != null and house.phone != ''"> and phone = #{house.phone}</if>
+ <if test="house.area != null "> and area = #{house.area}</if>
+ <if test="house.propertyPrice != null "> and property_price = #{house.propertyPrice}</if>
+ <if test="house.serviceDue != null "> and service_due = #{house.serviceDue}</if>
+ <if test="house.floor != null "> and floor = #{house.floor}</if>
+ <if test="house.building != null and house.building != ''"> and building = #{house.building}</if>
+ <if test="house.unit != null and house.unit != ''"> and unit = #{house.unit}</if>
+ <if test="house.room != null and house.room != ''"> and room = #{house.room}</if>
+ <if test="house.buildingNo != null "> and building_no = #{house.buildingNo}</if>
+ <if test="house.imageUrls != null and house.imageUrls != ''"> and image_urls = #{house.imageUrls}</if>
+ <if test="house.createUser != null and house.createUser != ''"> and create_user = #{house.createUser}</if>
+ <if test="house.createTime != null "> and create_time = #{house.createTime}</if>
+ <if test="house.updateUser != null and house.updateUser != ''"> and update_user = #{house.updateUser}</if>
+ <if test="house.updateTime != null "> and update_time = #{house.updateTime}</if>
+ <if test="house.remark != null and house.remark != ''"> and remark = #{house.remark}</if>
+ <if test="house.isDeleted != null "> and is_deleted = #{house.isDeleted}</if>
+ </where>
</select>
<!--房屋自定义详情查询-->
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml
index b24d6f8..74127e4 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml
@@ -15,9 +15,35 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <sql id="selectHouseTenant">
+ select
+ id,
+ housing_rental_id,
+ name,
+ phone,
+ id_card,
+ domicile,
+ work_unit,
+ remark,
+ is_deleted
+ from
+ jczz_house_tenant
+ </sql>
+
<select id="selectHouseTenantPage" resultMap="houseTenantResultMap">
- select * from jczz_house_tenant where is_deleted = 0
+ <include refid="selectHouseTenant"/>
+ <where>
+ <if test="houseTenant.id != null "> and id = #{houseTenant.id}</if>
+ <if test="houseTenant.housingRentalId != null "> and housing_rental_id = #{houseTenant.housingRentalId}</if>
+ <if test="houseTenant.name != null and name != ''"> and name = #{houseTenant.name}</if>
+ <if test="houseTenant.phone != null and phone != ''"> and phone = #{houseTenant.phone}</if>
+ <if test="houseTenant.idCard != null and idCard != ''"> and id_card = #{houseTenant.idCard}</if>
+ <if test="houseTenant.domicile != null and domicile != ''"> and domicile = #{houseTenant.domicile}</if>
+ <if test="houseTenant.workUnit != null and workUnit != ''"> and work_unit = #{houseTenant.workUnit}</if>
+ <if test="houseTenant.remark != null and remark != ''"> and remark = #{houseTenant.remark}</if>
+ <if test="houseTenant.isDeleted != null "> and is_deleted = #{houseTenant.isDeleted}</if>
+ </where>
</select>
<!--根据租房id删除租户信息-->
--
Gitblit v1.9.3