From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 334 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 259 insertions(+), 75 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 d916280..693bec8 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,6 +37,8 @@
<result column="update_time" property="updateTime"/>
<result column="remark" property="remark"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="confirm_flag" property="confirmFlag"/>
+ <result column="housing_rental_id" property="housingRentalId"/>
</resultMap>
<sql id="selectHousehold">
@@ -72,9 +74,10 @@
update_user,
update_time,
remark,
- is_deleted
- from
- jczz_household
+ is_deleted,
+ confirm_flag,
+ housing_rental_id
+ from jczz_household
</sql>
<resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
@@ -86,10 +89,119 @@
</collection>
</resultMap>
+ <resultMap id="householdPageAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
+ <id property="id" column="id"/>
+ <collection property="householdLabelList" javaType="java.util.List" select="selectHouseLabelPage" column="id"
+ ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
+ </collection>
+ </resultMap>
+
+ <select id="selectHouseLabelPage" resultType="org.springblade.modules.house.vo.HouseholdLabelVO">
+ select
+ id,
+ house_code,
+ label_id,
+ label_name,
+ color,
+ remark cremark,
+ user_id,
+ lable_type,
+ household_id
+ from
+ jczz_user_house_label
+ where household_id = #{id} and lable_type = 1
+ </select>
+
<!--自定义分页数据查询-->
- <select id="selectHouseholdPage" resultType="org.springblade.modules.house.vo.HouseholdVO">
+ <select id="selectHouseholdPage" resultMap="householdPageAndLabelMap">
select
jh.*,
+ jhs.district_name aoiName,
+ concat(jhs.building," ",unit," ",room) as address,
+ jda.town_street_name as townStreetName,jda.nei_name as neiName
+ from
+ jczz_household jh
+ join jczz_house jhs on jh.house_code = jhs.house_code and jhs.is_deleted = 0
+ left join jczz_doorplate_address jda on jda.address_code = jh.house_code
+ 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>
+ <if test="household.townStreetName!=null and household.townStreetName!=''">
+ and jda.town_street_name like concat('%',#{household.townStreetName},'%')
+ </if>
+ <if test="household.neiName!=null and household.neiName!=''">
+ and jda.nei_name like concat('%',#{household.neiName},'%')
+ </if>
+ <if test="household.housingRentalId != null ">
+ and jh.housing_rental_id = #{household.housingRentalId}
+ </if>
+ </select>
+
+ <!--查询房屋集合信息-->
+ <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,
+ jda.aoi_code aoiCode,
+ jh.relationship relationship
+ 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.house_code houseCode,
+ 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
@@ -109,79 +221,151 @@
</if>
</select>
- <!--查询房屋集合信息-->
- <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeNode" >
- 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 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_gridman jgm on jg.id = jgm.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 jgm.user_id = #{userId}
</select>
- <!--查询房屋集合信息-->
- <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
+ <!--查询物业-->
+ <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}
+ limit 1
+ </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} limit 1
+ </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>
+
+
+ <select id="getHouseHoldStatistics" resultType="java.util.Map">
+ SELECT
+ a.gender,
+ count( a.gender ) numbers
+ FROM
+ ( SELECT
+ IF
+ (
+ id_card IS NULL or id_card = '',
+ '未知',
+ IF
+ (SUBSTRING( id_card, 17, 1 ) % 2 = 1, '男', '女' )) AS gender
+ FROM
+ jczz_household jh
+ LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
+ WHERE
+ jda.nei_code = #{code}
+ AND jh.is_deleted = 0
+ and jda.doorplate_type = '户室牌'
+ <if test="userId != null and roleType == '1'">
+ AND jda.address_code IN (
+ SELECT DISTINCT
+ jgr.house_code
+ FROM
+ jczz_grid jg
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE
+ jgm.user_id = #{userId}
+ AND jg.is_deleted = 0
+ )
+ </if>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
+ </if>
+ ) a
+ GROUP BY
+ a.gender
+ </select>
+ <select id="getHouseHoldStatisticsAge" resultType="java.util.Map">
+
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>
+ case
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 0 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 3 then '0~3岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 4 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 17 then '4~17岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 18 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 39 then '18~39岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 40 and
+ TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 59 then '40~59岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 60 and
+ TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 79 then '60~79岁'
+ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上'
+ ELSE '无身份信息'
+ END AS age,
+ count(1) as number FROM
+ jczz_household jh
+ LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
+ WHERE
+ jda.nei_code = #{code}
+ and jda.doorplate_type = '户室牌'
+ AND jh.is_deleted = 0
+ <if test="userId != null and roleType == '1'">
+ AND jda.address_code IN (
+ SELECT
+ distinct jgr.house_code
+ FROM
+ jczz_grid jg
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE
+ jgm.user_id = #{userId}
+ AND jg.is_deleted = 0
+ )
+ </if>
- <!--查询房屋集合信息-按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>
+ <if test="userId != null and roleType == '3'">
+ AND jda.address_code IN (SELECT
+ jda.address_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
+ )
+ </if>
+ GROUP BY age
</select>
--
Gitblit v1.9.3