From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 845 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 636 insertions(+), 209 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 0bd181a..784962a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -9,15 +9,12 @@
<result column="name" property="name"/>
<result column="phone_number" property="phoneNumber"/>
<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="residential_status" property="residentialStatus"/>
<result column="gender" property="gender"/>
<result column="birthday" property="birthday"/>
<result column="id_card" property="idCard"/>
- <result column="hkmt_pass" property="hkmtPass"/>
- <result column="passport" property="passport"/>
<result column="ethnicity" property="ethnicity"/>
<result column="education" property="education"/>
<result column="hukou_registration" property="hukouRegistration"/>
@@ -42,41 +39,37 @@
</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,
- housing_rental_id
+ select id,
+ house_code,
+ name,
+ phone_number,
+ associated_user_id,
+ role_type,
+ relationship,
+ is_primary_contact,
+ residential_status,
+ gender,
+ birthday,
+ id_card,
+ 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,
+ housing_rental_id
from jczz_household
</sql>
@@ -98,19 +91,18 @@
</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 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>
<!--自定义分页数据查询-->
@@ -122,7 +114,6 @@
jh.phone_number,
jh.associated_user_id,
jh.role_type,
- jh.associated_user_name,
jh.relationship,
jh.is_primary_contact,
jh.residential_status,
@@ -130,9 +121,7 @@
jh.birthday,
jh.id_card,
jh.card_type,
- jh.hkmt_pass,
ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
- jh.passport,
jh.ethnicity,
jh.education,
jh.resident_type,
@@ -174,11 +163,12 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
+ LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
<where>
<if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
)
</if>
<if test="household.name!=null and household.name !=''">
@@ -211,9 +201,73 @@
<if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
</if>
- <if test="household.regionCode!=null and household.regionCode!=''">
- and jg.community_code like concat(#{household.regionCode},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="household.roleName != null and household.roleName != ''">
+ <if test="household.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jhs.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jhs.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="household.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
</if>
+<!-- <if test="isAdministrator==2">-->
+<!-- <choose>-->
+<!-- <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">-->
+<!-- and jg.community_code in-->
+<!-- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">-->
+<!-- #{code}-->
+<!-- </foreach>-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and jg.community_code in ('')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
+<!-- </if>-->
<if test="household.building!=null and household.building!=''">
and jhs.building like concat(#{household.building},'%')
</if>
@@ -238,14 +292,11 @@
jh.phone_number,
jh.associated_user_id,
jh.role_type,
- jh.associated_user_name,
jh.relationship,
jh.is_primary_contact,
jh.residential_status,
jh.birthday,
jh.id_card,
- jh.hkmt_pass,
- jh.passport,
ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
jh.ethnicity,
jh.education,
@@ -273,51 +324,51 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
- where jh.is_deleted = 0
- and jh.name != '' and jh.name is not null
- <if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
- )
- </if>
- <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>
- <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
- AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
- </if>
- <if test="household.regionCode!=null and household.regionCode!=''">
- and jg.community_code like concat('%',#{household.regionCode},'%')
- </if>
- <if test="household.id!=null and household.id!=''">
- and jh.id = #{household.id}
- </if>
- order by jh.create_time desc
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
+ where jh.is_deleted = 0
+ and jh.name != '' and jh.name is not null
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
+ </if>
+ <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>
+ <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
+ AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
+ </if>
+ <if test="household.regionCode!=null and household.regionCode!=''">
+ and jg.community_code like concat('%',#{household.regionCode},'%')
+ </if>
+ <if test="household.id!=null and household.id!=''">
+ and jh.id = #{household.id}
+ </if>
+ order by jh.create_time desc
</select>
@@ -333,72 +384,104 @@
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 jh.is_deleted = 0
- and jh.associated_user_id = #{userId}
+ left join jczz_doorplate_address jda on jh.house_code = jda.address_code
+ where 1 = 1
+ and jh.is_deleted = 0
+ and jh.associated_user_id = #{userId}
</select>
<!--查询房屋集合信息-->
<select id="getHouseholdListByCode" resultMap="householdAndLabelMap">
- select
- jh.*,
- jhl.id as cid,
- jhl.house_code houseCodes,
- jhl.label_id,
- jhl.label_name,
- jhl.color,
- jhl.user_id,
- jhl.lable_type,
- jhl.household_id,
- jhl.remark as cremark
+ select jh.*,
+ jhl.id as cid,
+ jhl.house_code houseCodes,
+ jhl.label_id,
+ jhl.label_name,
+ jhl.color,
+ jhl.user_id,
+ jhl.lable_type,
+ jhl.household_id,
+ 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}
- order by -jh.relationship desc,jh.id desc
+ 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}
+ order by -jh.relationship desc, jh.id desc
</select>
<!--查询房屋集合信息-按id-->
<select id="getHouseholdListById" resultMap="householdAndLabelMap">
- select
- jh.id,jh.house_code,jh.name,jh.phone_number,jh.associated_user_id,
- jh.role_type,jh.associated_user_name,jh.relationship,jh.is_primary_contact,
- jh.residential_status,jh.gender,jh.birthday,jh.id_card,
- jh.card_type,jh.card_no,jh.hkmt_pass,jh.passport,
- jh.ethnicity,jh.education,jh.resident_type,
- jh.hukou_registration,jh.resident_adcode,jh.native_place_adcode,
- jh.religious_belief,jh.health_status,jh.disease_name,
- jh.work_status,jh.employer,jh.occupation,jh.cmpy_reg_addr,
- jh.go_out_addr,jh.go_out_where,jh.go_out_time,jh.go_out_reason,
- jh.marital_status,jh.card_number,jh.other_contact,
- if(jda.id is not null,jda.address_name,jh.current_address) as current_address,
- jh.disability_cert,jh.party_ember,jh.remark,
- jh.confirm_flag,jh.housing_rental_id,
- if(jda.id is not null,substring(jda.town_street_code,1,9),jh.home_adcode) as home_adcode,
- br1.name as residentAdName,
- br1.province_code as residentProvinceAdCode,br1.province_name as residentProvinceAdName,
- br1.city_code as residentCityAdCode,br1.city_name as residentCityAdName,
- br2.name as nativePlaceAdName,
- br2.province_code as nativePlaceProvinceAdCode,br2.province_name as nativePlaceProvinceAdName,
- br2.city_code as nativePlaceCityAdCode,br2.city_name as nativePlaceCityAdName,
- jhs.source,
- jhl.id as cid,
- jhl.house_code houseCodes,
- jhl.label_id,
- jhl.label_name,
- jhl.color,
- jhl.user_id,
- jhl.lable_type,
- jhl.household_id,
- jhl.remark as cremark
+ select jh.id,
+ jh.house_code,
+ jh.name,
+ jh.phone_number,
+ jh.associated_user_id,
+ jh.role_type,
+ jh.relationship,
+ jh.is_primary_contact,
+ jh.residential_status,
+ jh.gender,
+ jh.birthday,
+ jh.id_card,
+ jh.card_type,
+ jh.card_no,
+ jh.ethnicity,
+ jh.education,
+ jh.resident_type,
+ jh.hukou_registration,
+ jh.resident_adcode,
+ jh.native_place_adcode,
+ jh.religious_belief,
+ jh.health_status,
+ jh.disease_name,
+ jh.work_status,
+ jh.employer,
+ jh.occupation,
+ jh.cmpy_reg_addr,
+ jh.go_out_addr,
+ jh.go_out_where,
+ jh.go_out_time,
+ jh.go_out_reason,
+ jh.marital_status,
+ jh.card_number,
+ jh.other_contact,
+ if(jda.id is not null, jda.address_name, jh.current_address) as current_address,
+ jh.disability_cert,
+ jh.party_ember,
+ jh.remark,
+ jh.confirm_flag,
+ jh.housing_rental_id,
+ if(jda.id is not null, substring(jda.town_street_code, 1, 9), jh.home_adcode) as home_adcode,
+ br1.name as residentAdName,
+ br1.province_code as residentProvinceAdCode,
+ br1.province_name as residentProvinceAdName,
+ br1.city_code as residentCityAdCode,
+ br1.city_name as residentCityAdName,
+ br2.name as nativePlaceAdName,
+ br2.province_code as nativePlaceProvinceAdCode,
+ br2.province_name as nativePlaceProvinceAdName,
+ br2.city_code as nativePlaceCityAdCode,
+ br2.city_name as nativePlaceCityAdName,
+ jhs.source,
+ jhl.id as cid,
+ jhl.house_code houseCodes,
+ jhl.label_id,
+ jhl.label_name,
+ jhl.color,
+ jhl.user_id,
+ jhl.lable_type,
+ jhl.household_id,
+ jhl.remark as cremark
from jczz_household jh
- left join jczz_user_house_label jhl on jh.id = jhl.household_id
- left join jczz_doorplate_address jda on jda.address_code = jh.house_code
- left join jczz_house jhs on jhs.house_code = jh.house_code
- left join blade_region br1 on br1.code = jh.resident_adcode
- left join blade_region br2 on br2.code = jh.native_place_adcode
- where 1=1 and jh.is_deleted = 0
- and jh.id = #{household.id}
+ left join jczz_user_house_label jhl on jh.id = jhl.household_id
+ left join jczz_doorplate_address jda on jda.address_code = jh.house_code
+ left join jczz_house jhs on jhs.house_code = jh.house_code
+ left join blade_region br1 on br1.code = jh.resident_adcode
+ left join blade_region br2 on br2.code = jh.native_place_adcode
+ where 1 = 1
+ and jh.is_deleted = 0
+ and jh.id = #{household.id}
</select>
<!--导出数据-->
@@ -407,7 +490,7 @@
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.birthday,jh.id_card idCard,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,
@@ -433,44 +516,89 @@
<select id="statistics" resultType="java.lang.Integer">
SELECT
- count( 1 )
+ count(1)
FROM
jczz_household jh
- LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
+ LEFT 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
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
+ LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
<where>
- <if test="neiCode != null and neiCode != ''">
- and jda.nei_code = #{neiCode}
+ <if test="household.neiCode != null and household.neiCode != ''">
+ and jda.nei_code = #{household.neiCode}
</if>
- <if test="userId != null">
- AND jh.house_code IN (
- SELECT
- jgr.house_code
- 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
- WHERE
- jg.is_deleted = 0
- AND jgm.user_id = #{userId} )
+ <if test="household.confirmFlag != null and household.confirmFlag != ''">
+ and jh.confirm_flag = #{household.confirmFlag}
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="household.roleName != null and household.roleName != ''">
+ <if test="household.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jhs.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jhs.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="household.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
</if>
and jh.is_deleted = 0
- and jh.confirm_flag = 0
</where>
</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}
- limit 1
+ SELECT jpcd.property_company_id AS CODE,
+ bu.name 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
+ LEFT JOIN blade_user bu ON bu.id = jpcd.principal
+ WHERE 1 = 1
+ AND jda.address_code = #{household.houseCode} limit 1
</select>
<!--查询网格-->
@@ -487,12 +615,11 @@
<!--查询公安信息-->
<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 address_code as code,
+ policeman as name,
+ policeman_phone as phone
+ FROM jczz_doorplate_address
+ WHERE address_code = #{household.houseCode}
</select>
@@ -535,7 +662,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -587,7 +714,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
GROUP BY age
@@ -595,11 +722,12 @@
<!--查询所有未入库的业主信息-->
<select id="getNotInsertUserHousehold" resultType="org.springblade.modules.house.entity.HouseholdEntity">
- select jh.* from jczz_household jh
+ select jh.*
+ from jczz_household jh
where jh.is_deleted = 0
- and jh.relationship = 1
- and jh.associated_user_id is null
- and jh.phone_number !=''
+ and jh.relationship = 1
+ and jh.associated_user_id is null
+ and jh.phone_number !=''
and length(jh.name)<=12
</select>
@@ -622,14 +750,11 @@
jh.phone_number,
jh.associated_user_id,
jh.role_type,
- jh.associated_user_name,
jh.relationship,
jh.is_primary_contact,
jh.residential_status,
jh.birthday,
jh.id_card,
- jh.hkmt_pass,
- jh.passport,
ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
jh.ethnicity,
jh.education,
@@ -658,12 +783,12 @@
jczz_household jh
LEFT 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
- LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_user_house_label juhl on juhl.house_code = jda.address_code and lable_type=1
<where>
<if test="household.userId!=null">
- AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
)
</if>
<if test="household.name!=null and household.name !=''">
@@ -717,4 +842,306 @@
</where>
</select>
+
+ <select id="getKeynotePersonnelPage" resultMap="householdPageAndLabelMap">
+
+ SELECT
+ jh.id,
+ jh.house_code,
+ jh.NAME,
+ jh.phone_number,
+ jh.associated_user_id,
+ jh.role_type,
+ jh.relationship,
+ jh.is_primary_contact,
+ jh.residential_status,
+ jh.gender,
+ jh.birthday,
+ jh.id_card,
+ jh.card_type,
+ ifnull( jh.gender, CASE WHEN substring( jh.id_card, 17, 1 )% 2 = 1 THEN 1 ELSE 0 END ) AS gender,
+ jh.ethnicity,
+ jh.education,
+ jh.resident_type,
+ jh.hukou_registration,
+ jh.resident_adcode,
+ jh.native_place_adcode,
+ jh.religious_belief,
+ jh.health_status,
+ jh.disease_name,
+ jh.work_status,
+ jh.employer,
+ jh.occupation,
+ jh.cmpy_reg_addr,
+ jh.go_out_addr,
+ jh.go_out_where,
+ jh.go_out_time,
+ jh.go_out_reason,
+ jh.marital_status,
+ jh.card_number,
+ jh.other_contact,
+ IF
+ ( jda.id IS NOT NULL, jda.address_name, jh.current_address ) AS current_address,
+ jh.disability_cert,
+ jh.party_ember,
+ jh.remark,
+ jh.confirm_flag,
+ jh.housing_rental_id,
+ IF
+ ( jda.id IS NOT NULL, substring( jda.town_street_code, 1, 9 ), jh.home_adcode ) AS home_adcode,
+ jhs.district_name aoiName,
+ concat( jhs.building, " ", unit, " ", room ) AS address,
+ jda.town_street_name AS townStreetName,
+ jda.nei_name AS neiName,
+ jg.grid_name,
+ jhs.building,
+ jhs.district_code aoiCode,
+ jhs.unit
+ FROM
+ jczz_household jh
+ LEFT 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
+ LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
+ <where>
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
+ </if>
+ <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>
+ <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
+ AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
+ </if>
+ <if test="household.regionCode!=null and household.regionCode!=''">
+ and jg.community_code like concat(#{household.regionCode},'%')
+ </if>
+ <if test="household.building!=null and household.building!=''">
+ and jhs.building like concat(#{household.building},'%')
+ </if>
+ <if test="household.unit!=null and household.unit!=''">
+ and jhs.unit like concat(#{household.unit},'%')
+ </if>
+ <if test="household.aoiCode!=null and household.aoiCode!=''">
+ and jhs.district_code = #{household.aoiCode}
+ </if>
+ and jh.id in (
+ SELECT DISTINCT
+ juhl.household_id
+ FROM
+ jczz_user_house_label juhl
+ LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+ WHERE
+ juhl.lable_type = 1
+ <if test="household.labelId != null ">
+ AND jl.id = #{household.labelId}
+ </if>
+ <if test="household.parentId != null ">
+ AND jl.parent_id = #{household.parentId}
+ </if>
+ AND juhl.label_id IS NOT NULL
+ )
+ and jh.is_deleted = 0
+ order by jh.create_time desc
+ </where>
+ </select>
+
+ <!--根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户）-->
+ <select id="getHouseholdListByParam" resultType="org.springblade.modules.house.vo.HouseholdVO">
+ select jh.* from jczz_household jh
+ left join jczz_user_house_label juhl on juhl.household_id = jh.id
+ where jh.is_deleted = 0
+ and juhl.lable_type = 1
+ and juhl.color = 'green'
+ and jh.id in (
+ select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
+ create_time )=30
+ )
+ <choose>
+ <when test="list!=null and list.size()>0">
+ and juhl.label_id in
+ <foreach collection="list" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and juhl.label_id in ('')
+ </otherwise>
+ </choose>
+ union all
+ (
+ select jh.* from jczz_household jh
+ left join jczz_user_house_label juhl on juhl.household_id = jh.id
+ where jh.is_deleted = 0
+ and juhl.lable_type = 1
+ and juhl.color = 'yellow'
+ and jh.id in (
+ select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
+ create_time )=14
+ )
+ <choose>
+ <when test="list!=null and list.size()>0">
+ and juhl.label_id in
+ <foreach collection="list" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and juhl.label_id in ('')
+ </otherwise>
+ </choose>
+ )
+ union all
+ (
+ select jh.* from jczz_household jh
+ left join jczz_user_house_label juhl on juhl.household_id = jh.id
+ where jh.is_deleted = 0
+ and juhl.lable_type = 1
+ and juhl.color = 'red'
+ and jh.id in (
+ select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
+ create_time )=7
+ )
+ <choose>
+ <when test="list!=null and list.size()>0">
+ and juhl.label_id in
+ <foreach collection="list" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and juhl.label_id in ('')
+ </otherwise>
+ </choose>
+ )
+ union all
+ (
+ select jh.* from jczz_household jh
+ left join jczz_user_house_label juhl on juhl.household_id = jh.id
+ where jh.is_deleted = 0 and juhl.lable_type = 1
+ and jh.id not in (
+ select household_id from jczz_grid_work_log where is_deleted = 0
+ and household_id is not null
+ and source = 2
+ group by household_id
+ )
+ <choose>
+ <when test="list!=null and list.size()>0">
+ and juhl.label_id in
+ <foreach collection="list" item="id" separator="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and juhl.label_id in ('')
+ </otherwise>
+ </choose>
+ )
+ </select>
+ <select id="getlabelStatistics" resultType="org.springblade.common.node.TreeIntegerNode">
+ SELECT
+ jl.id AS id,
+ jl.parent_id AS parentId,
+ jl.label_name AS name,
+ jl.sort,
+ (SELECT
+ count(juhl.household_id ) counts
+ FROM
+ jczz_user_house_label juhl
+ LEFT JOIN jczz_household jh ON juhl.household_id = jh.id
+ LEFT 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
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jhs.grid_code AND jg.is_deleted = 0
+ <where>
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
+ </if>
+ <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>
+ <if test="household.startTime != null and household.startTime != '' and household.endTime != null and household.endTime != '' ">
+ AND jh.create_time BETWEEN #{household.startTime} and #{household.endTime}
+ </if>
+ <if test="household.regionCode!=null and household.regionCode!=''">
+ and jg.community_code like concat(#{household.regionCode},'%')
+ </if>
+ <if test="household.building!=null and household.building!=''">
+ and jhs.building like concat(#{household.building},'%')
+ </if>
+ <if test="household.unit!=null and household.unit!=''">
+ and jhs.unit like concat(#{household.unit},'%')
+ </if>
+ <if test="household.aoiCode!=null and household.aoiCode!=''">
+ and jhs.district_code = #{household.aoiCode}
+ </if>
+ <if test="household.labelId != null ">
+ AND jl.id = #{household.labelId}
+ </if>
+ <if test="household.parentId != null ">
+ AND jl.parent_id = #{household.parentId}
+ </if>
+ AND juhl.label_id IS NOT NULL
+ and juhl.lable_type = 1
+ and jh.is_deleted = 0
+ AND juhl.label_id = jl.id
+ </where>
+ ) count
+ FROM
+ jczz_label jl where is_deleted = 0
+ and jl.id != '1002'
+ and jl.id != '1001'
+ and jl.parent_id != '1001'
+ </select>
+
</mapper>
--
Gitblit v1.9.3