12/30 河门口大屏特殊修改

101captain

2021-12-30 e9d5fb4b01c383fa5b01bf5e730d4e3da73f266e

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserInputDAO.xml

@@ -47,7 +47,7 @@
    </select>

    <select id="selectComMngStructArea" resultType="com.panzhihua.common.model.vos.community.ComMngStructAreaVO">
        select a.id,a.community_id,a.area_name,address_detail from com_mng_struct_area a where a.community_id = #{communityId}
        select a.id,a.community_id,a.area_name,address_detail from com_mng_struct_area a where a.community_id = ${communityId}
    </select>

    <select id="specialUserExport" resultType="com.panzhihua.common.model.dtos.user.EexcelUserDTO">
@@ -59,7 +59,7 @@
        if(u.low_income_households=1,'是','否') lowIncomeHouseholds, if(u.low_income_people=1,'是','否') lowIncomePeople,
        if(u.old_people=1,'是','否') oldPeople, if(u.special_service_family=1,'是','否') specialServiceFamily,
        if(u.key_personnel=1,'是','否') keyPersonnel, u.tags FROM sys_user_input u JOIN com_mng_struct_area c ON u.area_id
        = c.id where u.community_id = #{exportSpecialUserDTO.communityId}
        = c.id where u.community_id = ${exportSpecialUserDTO.communityId}
        <if
                test='exportSpecialUserDTO.areaName != null and exportSpecialUserDTO.areaName.trim() != &quot;&quot;'>
            AND
@@ -87,7 +87,7 @@
        if(u.low_income_households=1,'是','否') lowIncomeHouseholds, if(u.low_income_people=1,'是','否') lowIncomePeople,
        if(u.old_people=1,'是','否') oldPeople, if(u.special_service_family=1,'是','否') specialServiceFamily,
        if(u.key_personnel=1,'是','否') keyPersonnel, u.tags FROM sys_user_input u where
        u.community_id = #{exportUserDTO.communityId}
        u.community_id = ${exportUserDTO.communityId}
        <if
                test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>JOIN
            com_mng_struct_area c ON u.area_id = c.id
@@ -113,7 +113,7 @@
        t1.area_name as areaName, t.political_outlook politicalOutlook, CONCAT( IF ( t.soldier = 1, '军人,', '' ), IF (
        t.low_income_households = 1, '低保户,', '' ), IF ( t.low_income_people = 1, '低收入,', '' ), IF ( t.old_people = 1,
        '特服家庭,', '' ), IF ( t.key_personnel = 1, '重点人员,', '' ) ) tags, t.create_at as createAt FROM sys_user_input t
        LEFT JOIN com_mng_struct_area t1 ON t.area_id = t1.id WHERE t.community_id = #{pageInputUserDTO.communityId}
        LEFT JOIN com_mng_struct_area t1 ON t.area_id = t1.id WHERE t.community_id = ${pageInputUserDTO.communityId}
        <if
                test='pageInputUserDTO.name != null and pageInputUserDTO.name.trim() != &quot;&quot;'>and t.`name` like
            concat(#{pageInputUserDTO.name},'%')
@@ -135,7 +135,7 @@
        ( t.low_income_households = 1, '低保户,', '' ), IF ( t.low_income_people = 1, '低收入,', '' ), IF ( t.old_people = 1,
        '特服家庭,', '' ), IF ( t.key_personnel = 1, '重点人员,', '' ), IFNULL(t.tags,'') ) tags, t2.house_name as address,
        t.create_at as createAt FROM sys_user_input t LEFT JOIN com_mng_struct_area t1 ON t.area_id = t1.id LEFT JOIN
        com_mng_struct_house t2 ON t.house_code = t2.house_code WHERE t.community_id = #{pageInputUserDTO.communityId}
        com_mng_struct_house t2 ON t.house_code = t2.house_code WHERE t.community_id = ${pageInputUserDTO.communityId}
        AND (t.soldier=1 OR t.low_income_households=1 OR t.low_income_people=1 or t.old_people=1 OR
        t.special_service_family=1 OR t.key_personnel=1 OR
        (t.tags IS NOT NULL AND TRIM(t.tags)!=''))