议事报名

linwei

2024-01-06 33c929d0e614a46745bfb08e71bf3a8415be198e

议事报名

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml

@@ -49,14 +49,16 @@
        SELECT
        code as id,
        parent_code as parentId,
        name
        name,
        remark aoiCode
        FROM blade_region where district_code = '361102'
        union all
        (
        select
        id,
        community_code as parentId,
        name
        name,
        aoi_code aoiCode
        from jczz_district
        where is_deleted = 0
        <if test="district.districtIdList!=null and district.districtIdList!=''">

 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"/>
@@ -92,7 +92,7 @@

    <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"
        <collection property="householdLabelList" javaType="java.util.List" select="selectHouseLabelPage" column="id"
                    ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
        </collection>
    </resultMap>
@@ -116,25 +116,59 @@
    <!--自定义分页数据查询-->
    <select id="selectHouseholdPage" resultMap="householdPageAndLabelMap">
        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.hkmt_pass,
        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.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,
        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,
        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,
        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
        jg.grid_name,
        jhs.building,
        jhs.unit
        FROM
        jczz_household jh
        LEFT JOIN jczz_house jhs ON jh.house_code = jhs.house_code and jhs.is_deleted = 0
@@ -177,7 +211,16 @@
                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},'%')
                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.is_deleted = 0
            order by jh.create_time desc
@@ -279,7 +322,7 @@


    <!--查询房屋集合信息-->
    <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeStringNode" >
    <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,
@@ -296,7 +339,7 @@
    </select>

    <!--查询房屋集合信息-->
    <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
    <select id="getHouseholdListByCode" resultMap="householdAndLabelMap">
        select
            jh.*,
            jhl.id as cid,
@@ -316,7 +359,7 @@
    </select>

    <!--查询房屋集合信息-按id-->
    <select id="getHouseholdListById" resultMap="householdAndLabelMap" >
    <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,
@@ -501,10 +544,13 @@
    <select id="getHouseHoldStatisticsAge" resultType="java.util.Map">

        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岁'
        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

 src/main/java/org/springblade/modules/house/vo/HouseholdVO.java

@@ -17,10 +17,9 @@
package org.springblade.modules.house.vo;

import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.house.entity.HouseholdEntity;

import java.util.ArrayList;
import java.util.List;
@@ -138,4 +137,10 @@
     */
    private String nativePlaceCityAdCode;

    private String building;

    private String unit;

    private String aoiCode;

}