From bc670e87f764e250a54b1687dedbe0df135b411f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 14:12:08 +0800
Subject: [PATCH] 房屋树查询新增，房屋，住户，租赁查询修改
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 144 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index e9661e6..d916280 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -39,17 +39,149 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <sql id="selectHousehold">
+ select
+ id,
+ house_code,
+ name,
+ phone_number,
+ associated_user_id,
+ role_type,
+ associated_user_name,
+ relationship,
+ is_primary_contact,
+ residential_status,
+ gender,
+ birthday,
+ id_card,
+ hkmt_pass,
+ passport,
+ ethnicity,
+ education,
+ hukou_registration,
+ work_status,
+ employer,
+ marital_status,
+ card_number,
+ other_contact,
+ current_address,
+ disability_cert,
+ party_ember,
+ create_user,
+ create_time,
+ update_user,
+ update_time,
+ remark,
+ is_deleted
+ from
+ jczz_household
+ </sql>
+
+ <resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
+ <id property="id" column="id"/>
+ <collection property="householdLabelList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
+ <id property="id" column="cid"/>
+ <result property="remark" column="cremark"/>
+ </collection>
+ </resultMap>
+
<!--自定义分页数据查询-->
- <select id="selectHouseholdPage" resultMap="householdResultMap">
- select * from jczz_household where is_deleted = 0
+ <select id="selectHouseholdPage" resultType="org.springblade.modules.house.vo.HouseholdVO">
+ select
+ jh.*,
+ jhs.district_name aoiName,
+ concat(jhs.building," ",unit," ",room) as address
+ from
+ jczz_household jh join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
+ where jh.is_deleted = 0
+ <if test="household.name!=null and household.name !=''">
+ and jh.name like concat('%',#{household.name},'%')
+ </if>
+ <if test="household.phoneNumber!=null and household.phoneNumber !=''">
+ and jh.phone_number like concat('%',#{household.phoneNumber},'%')
+ </if>
+ <if test="household.idCard!=null and household.idCard !=''">
+ and jh.id_card like concat('%',#{household.idCard},'%')
+ </if>
+ <if test="household.aoiName!=null and household.aoiName !=''">
+ and jhs.district_name like concat('%',#{household.aoiName},'%')
+ </if>
</select>
<!--查询房屋集合信息-->
<select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeNode" >
- select jh.house_code as id,jda.address_name as name,false as hasChildren from jczz_household jh
- left join jczz_doorplate_address jda on jh.house_code = jda.address_code
- where 1=1
- and associated_user_id = #{userId}
+ select jh.house_code as id,
+ jh.house_code as houseCode,
+ jda.address_name as name,
+ false as hasChildren,
+ jda.doorplate_type doorplateType,
+ jda.address_level addressLevel,
+ jda.nei_name neiName
+ from jczz_household jh
+ left join jczz_doorplate_address jda on jh.house_code = jda.address_code
+ where 1 = 1
+ and associated_user_id = #{userId}
+ </select>
+
+ <!--查询房屋集合信息-->
+ <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
+ select
+ jh.*,
+ jhl.id as cid,jhl.*,jhl.remark as cremark
+ from jczz_household jh
+ left join jczz_household_label jhl on jh.id = jhl.household_id
+ where 1=1 and is_deleted = 0
+ and house_code = #{code}
+ </select>
+
+ <!--查询房屋集合信息-按id-->
+ <select id="getHouseholdListById" resultMap="householdAndLabelMap" >
+ select
+ jh.*,
+ jhl.id as cid,jhl.*,jhl.remark as cremark
+ from jczz_household jh
+ left join jczz_household_label jhl on jh.id = jhl.household_id
+ where 1=1 and is_deleted = 0
+ and jh.id = #{household.id}
+ </select>
+
+ <select id="export" resultType="org.springblade.modules.house.excel.HouseHoldExcel">
+ <include refid="selectHousehold"/>
+ <where>
+ <if test="id != null "> and id = #{id}</if>
+ <if test="houseCode != null and houseCode != ''"> and house_code = #{houseCode}</if>
+ <if test="name != null and name != ''"> and name = #{name}</if>
+ <if test="phoneNumber != null and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
+ <if test="associatedUserId != null "> and associated_user_id = #{associatedUserId}</if>
+ <if test="roleType != null "> and role_type = #{roleType}</if>
+ <if test="associatedUserName != null and associatedUserName != ''"> and associated_user_name = #{associatedUserName}</if>
+ <if test="relationship != null "> and relationship = #{relationship}</if>
+ <if test="isPrimaryContact != null "> and is_primary_contact = #{isPrimaryContact}</if>
+ <if test="residentialStatus != null "> and residential_status = #{residentialStatus}</if>
+ <if test="gender != null "> and gender = #{gender}</if>
+ <if test="birthday != null "> and birthday = #{birthday}</if>
+ <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
+ <if test="hkmtPass != null and hkmtPass != ''"> and hkmt_pass = #{hkmtPass}</if>
+ <if test="passport != null and passport != ''"> and passport = #{passport}</if>
+ <if test="ethnicity != null "> and ethnicity = #{ethnicity}</if>
+ <if test="education != null "> and education = #{education}</if>
+ <if test="hukouRegistration != null and hukouRegistration != ''"> and hukou_registration = #{hukouRegistration}</if>
+ <if test="workStatus != null "> and work_status = #{workStatus}</if>
+ <if test="employer != null and employer != ''"> and employer = #{employer}</if>
+ <if test="maritalStatus != null "> and marital_status = #{maritalStatus}</if>
+ <if test="cardNumber != null and cardNumber != ''"> and card_number = #{cardNumber}</if>
+ <if test="otherContact != null and otherContact != ''"> and other_contact = #{otherContact}</if>
+ <if test="currentAddress != null and currentAddress != ''"> and current_address = #{currentAddress}</if>
+ <if test="disabilityCert != null and disabilityCert != ''"> and disability_cert = #{disabilityCert}</if>
+ <if test="partyEmber != null "> and party_ember = #{partyEmber}</if>
+ <if test="createUser != null "> and create_user = #{createUser}</if>
+ <if test="createTime != null "> and create_time = #{createTime}</if>
+ <if test="updateUser != null "> and update_user = #{updateUser}</if>
+ <if test="updateTime != null "> and update_time = #{updateTime}</if>
+ <if test="remark != null and remark != ''"> and remark = #{remark}</if>
+ <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
+ </where>
</select>
--
Gitblit v1.9.3