Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java

@@ -38,13 +38,16 @@
    * @param gridWorkLog
    * @return
    */
   List<GridWorkLogVO> selectGridWorkLogPage(IPage page,@Param("gridWorkLog") GridWorkLogVO gridWorkLog);
   List<GridWorkLogVO> selectGridWorkLogPage(IPage page,
                                   @Param("gridWorkLog") GridWorkLogVO gridWorkLog,
                                   @Param("regionChildCodesList") List<String> regionChildCodesList,
                                   @Param("isAdministrator") Integer isAdministrator);

   /**
    * 走访日志数量统计
    * @param gridId 网格id
    * @param gridCode 网格编号
    * @param status 状态
    * @return
    */
    Integer getGridWorkCountHandleCount(@Param("gridId") Integer gridId,@Param("status")  Integer status);
    Integer getGridWorkCountHandleCount(@Param("gridCode") String gridCode,@Param("status")  Integer status);
}