Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

 src/main/java/org/springblade/modules/taskPlaceSelfCheck/mapper/TaskPlaceSelfCheckMapper.xml

@@ -166,6 +166,7 @@
                </choose>
            </if>
        </where>
        order by jpc.create_time desc
    </select>

    <resultMap type="org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO"
@@ -347,7 +348,8 @@


    <!--导出消防自查信息-->
    <select id="exportTaskPlaceSelfCheck" resultType="org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel">
    <select id="exportTaskPlaceSelfCheck"
            resultType="org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel">
        select
        jpc.id,
        case when jpc.status=1 then '待审核'
@@ -483,4 +485,12 @@
            </if>
        </where>
    </select>
    <select id="getCount" resultType="java.lang.Integer">
        SELECT count(1)
        FROM jczz_task_place_self_check jtpsc
                 LEFT JOIN jczz_place jp ON jp.house_code = jtpsc.house_code
        WHERE jp.jw_grid_code IN
              (SELECT jpag.jw_grid_code FROM jczz_police_affairs_grid jpag WHERE jpag.police_user_id like concat('%',${userId},'%') )
          AND jtpsc.`status` = 1
    </select>
</mapper>