走访日志查询修改

zhongrj

2024-01-06 9683dc8df6fa6fa14c0586f8fab8108fcb66513f

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -116,37 +116,20 @@
    <!--自定义分页数据查询-->
    <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.birthday,
        jh.id_card,
        jh.hkmt_pass,
        jh.passport,
        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.ethnicity,
        jh.education,
        jh.hukou_registration,
        jh.work_status,
        employer,
        jh.marital_status,
        jh.card_number,
        jh.other_contact,
        jh.current_address,
        jh.disability_cert,
        jh.party_ember,
        jh.create_user,
        jh.create_time,
        jh.update_user,
        jh.update_time,
        jh.remark,
        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,
@@ -215,9 +198,9 @@
               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}
        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>

    <!--查询房屋集合信息-->
@@ -237,6 +220,7 @@
        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 asc,jh.id desc
    </select>

    <!--查询房屋集合信息-按id-->
@@ -244,7 +228,7 @@
        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.hkmt_pass,jh.passport,
            jh.residential_status,jh.gender,jh.birthday,jh.id_card,jh.card_type,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,
@@ -252,8 +236,15 @@
         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.create_user,jh.create_time,jh.update_user,jh.update_time,jh.remark,jh.is_deleted,
            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,
@@ -268,6 +259,8 @@
        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>