Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

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

@@ -85,6 +85,7 @@
        <collection property="householdLabelList" javaType="java.util.List"
                    ofType="org.springblade.modules.house.vo.HouseholdLabelVO" autoMapping="true">
            <id property="id" column="cid"/>
            <id property="houseCode" column="houseCodes"/>
            <result property="remark" column="cremark"/>
        </collection>
    </resultMap>
@@ -145,6 +146,7 @@
        jh.create_time,
        jh.update_user,
        jh.update_time,
        jh.confirm_flag,
        jh.remark,
        jhs.district_name aoiName,
        concat( jhs.building, " ", unit, " ", room ) AS address,
@@ -157,46 +159,49 @@
        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
        LEFT JOIN jczz_gridman jgm on jgm.grid_id=jg.id
        WHERE
        jh.is_deleted = 0
        <if test="household.userId!=null">
            and 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>
        order by jh.create_time desc
        <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}
                )
            </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>
            and jh.is_deleted = 0
            order by jh.create_time desc
        </where>


    </select>

    <!--查询房屋集合信息-->
@@ -220,7 +225,15 @@
    <select id="getHouseholdListByCode" resultMap="householdAndLabelMap" >
        select
            jh.*,
            jhl.id as cid,jhl.*,jhl.remark as cremark
            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
@@ -230,11 +243,42 @@
    <!--查询房屋集合信息-按id-->
    <select id="getHouseholdListById" resultMap="householdAndLabelMap" >
        select
            jh.*,
            jhl.id as cid,jhl.*,jhl.remark as cremark
            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.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
        where 1=1 and is_deleted = 0
        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>

@@ -427,5 +471,14 @@
        GROUP BY age
    </select>

    <!--查询所有未入库的业主信息-->
    <select id="getNotInsertUserHousehold" resultType="org.springblade.modules.house.entity.HouseholdEntity">
        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 length(jh.name)&lt;=12
    </select>

</mapper>