Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/task/mapper/TaskMapper.java

@@ -50,10 +50,17 @@
                          @Param("regionChildCodesList") List<String> regionChildCodesList,
                          @Param("isAdministrator") Integer isAdministrator);

   Integer selectTaskCount(TaskVO task);
   Integer selectTaskCount(@Param("task") TaskVO task,
                     @Param("regionChildCodesList") List<String> regionChildCodesList,
                     @Param("isAdministrator") Integer isAdministrator,
                     @Param("gridCodeList") List<String> gridCodeList);


   List<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task);
   List<TaskVO> getBailReportingPage(IPage<TaskVO> page,
                             @Param("task") TaskVO task,
                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                             @Param("gridCodeList") List<String> gridCodeList,
                             @Param("isAdministrator") Integer isAdministrator);

   /**
    * 查询取保候审任务列表(人房相关)