Merge branch 'dev_export_excel' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml

@@ -36,8 +36,8 @@
             AND patrol_total > 0
             <choose>
                 <when test='dataType == "agency"'>
-                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
+                    <foreach collection="idList" item="id" open="AND (" close=")" separator=" OR ">
-                        #{id}
+                        grid_pids like concat('%', #{id}, '%')
                     </foreach>
                 </when>
                 <otherwise>