From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 200 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 191 insertions(+), 9 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..f4d75a3 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -11,7 +11,7 @@
<result column="associated_user_id" property="associatedUserId"/>
<result column="associated_user_name" property="associatedUserName"/>
<result column="relationship" property="relationship"/>
- <result column="primary_contact" property="primaryContact"/>
+<!-- <result column="primary_contact" property="primaryContact"/>-->
<result column="residential_status" property="residentialStatus"/>
<result column="gender" property="gender"/>
<result column="birthday" property="birthday"/>
@@ -28,7 +28,7 @@
<result column="other_contact" property="otherContact"/>
<result column="current_address" property="currentAddress"/>
<result column="disability_cert" property="disabilityCert"/>
- <result column="data_status" property="dataStatus"/>
+<!-- <result column="data_status" property="dataStatus"/>-->
<result column="role_type" property="roleType"/>
<result column="party_ember" property="partyEmber"/>
<result column="create_user" property="createUser"/>
@@ -37,19 +37,201 @@
<result column="update_time" property="updateTime"/>
<result column="remark" property="remark"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="confirm_flag" property="confirmFlag"/>
+ </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,
+ confirm_flag
+ 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.houseCode!=null and household.houseCode !=''">
+ and jh.house_code = #{household.houseCode}
+ </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>
+ <if test="household.confirmFlag != null ">
+ and jh.confirm_flag = #{household.confirmFlag}
+ </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 id="selectHouseNodeList" resultType="org.springblade.common.node.TreeStringNode" >
+ 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_user_house_label jhl on jh.id = jhl.household_id
+ where 1=1 and jh.is_deleted = 0
+ and jh.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_user_house_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">
+ select
+ jh.name,jh.phone_number phoneNumber,jh.role_type roleType,jh.relationship relationship,
+ jh.is_primary_contact isPrimaryContact,jh.residential_status residentialStatus,jh.gender,
+ jh.birthday,jh.id_card idCard,jh.hkmt_pass hkmtPass,jh.passport,jh.ethnicity,jh.education,
+ jh.hukou_registration hukouRegistration,jh.work_status workStatus,jh.employer,jh.marital_status maritalStatus,
+ jh.card_number cardNumber,jh.other_contact otherContact,jh.current_address currentAddress,
+ jh.disability_cert disabilityCert,jh.party_ember partyEmber,jh.remark,
+ 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="statistics" resultType="java.lang.Integer">
+
+ SELECT
+ count(1)
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
+ WHERE
+ jg.is_deleted = 0
+ and jh.confirm_flag = 0
+ AND jg.user_id = #{userId}
+
+ </select>
+
+ <!--查询物业-->
+ <select id="getProperty" resultType="org.springblade.modules.house.vo.HouseholdOtherVO">
+ SELECT
+ jpcd.property_company_id as code,
+ jpcd.principal as name,
+ jpcd.principal_phone as phone
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_district jd ON jd.aoi_code = jda.aoi_code
+ LEFT JOIN jczz_property_company_district jpcd on jpcd.district_id=jd.id
+ WHERE 1=1
+ AND jda.address_code = #{household.houseCode}
+ </select>
+
+ <!--查询网格-->
+ <select id="getGrid" resultType="org.springblade.modules.house.vo.HouseholdOtherVO">
+ SELECT
+ jg.id as code,
+ jgm.gridman_name as name,jgm.mobile as phone
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id and jgm.is_deleted = 0
+ WHERE 1=1
+ AND jgr.house_code = #{household.houseCode}
+ </select>
+
+ <!--查询公安信息-->
+ <select id="getSecurity" resultType="org.springblade.modules.house.vo.HouseholdOtherVO">
+ SELECT
+ address_code as code,policeman as name,policeman_phone as phone
+ FROM
+ jczz_doorplate_address
+ WHERE
+ address_code = #{household.houseCode}
</select>
--
Gitblit v1.9.3