lin
2024-04-15 bdfb1bfaf5dc5d7318c632fcc6fdf3ffacbd075f
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -171,6 +171,10 @@
            AND jtrfr.create_user = #{vo.createUser}
        </if>
        <if test="vo.houseCode != null and vo.houseCode != ''">
            and jtrfr.address_code = #{vo.houseCode}
        </if>
        <if test="vo.streetName != null and vo.streetName != ''">
            AND br.town_name like concat('%',#{vo.streetName},'%')
        </if>
@@ -220,7 +224,7 @@
                    <foreach collection="aoiCodeList" item="item" separator="," open="(" close=")">
                        #{item}
                    </foreach>
                        or
                    or
                    jp.aoi_code in
                    <foreach collection="aoiCodeList" item="item" separator="," open="(" close=")">
                        #{item}
@@ -232,8 +236,8 @@
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>
            </if>
            <!-- 网格员及其他 -->
            <if test="vo.roleType ==null">
            <!-- 其他 -->
            <if test="vo.roleType ==null and vo.roleName !='wgy' ">
                <choose>
                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                        and (
@@ -249,7 +253,9 @@
                        )
                    </when>
                </choose>
            </if>
            <!-- 网格员 -->
            <if test="vo.roleName =='wgy' ">
                <choose>
                    <when test="gridCodeList !=null and gridCodeList.size()>0">
                        and (
@@ -257,7 +263,7 @@
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
                            or
                        or
                        jp.grid_code in
                        <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                            #{code}
@@ -272,7 +278,6 @@
                <if test="vo.confirmUserId != null ">
                    or jtrfr.confirm_user_id = #{vo.confirmUserId}
                </if>
            </if>
        </if>
        ORDER BY jtrfr.create_time DESC
@@ -347,11 +352,15 @@
        jczz_task_report_for_repairs jtr
        LEFT JOIN jczz_house jh ON jh.house_code = jtr.address_code
        LEFT JOIN jczz_place jp ON jtr.address_code = jp.house_code
        LEFT JOIN jczz_grid jg on (jh.grid_code = jg.grid_code or jp.grid_code = jg.grid_code )
        <where>
            and jtr.is_deleted = 0
            and jtr.confirm_flag = 1
            <if test="neiCode !=null and neiCode !=''">
                and jg.community_code = #{neiCode}
            </if>
            <if test="userId != null and roleName == 'wgy'" >
            <if test="userId != null and roleName == 'wgy'">
                AND (
                jp.grid_code IN (
                SELECT
@@ -402,7 +411,8 @@
    <!--更新状态-临时接口-->
    <update id="updateView">
        update jczz_task_report_for_repairs set view_type = 1
        update jczz_task_report_for_repairs
        set view_type = 1
    </update>