Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -43,7 +43,10 @@
    */
   List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,
                                                @Param("vo") TaskReportForRepairsVO taskReportForRepairs,
                                                @Param("list") List<String> list);
                                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                @Param("isAdministrator") Integer isAdministrator,
                                                @Param("aoiCodeList") List<String> aoiCodeList,
                                                @Param("gridCodeList") List<String> gridCodeList);


   /**
@@ -52,9 +55,12 @@
    * @param userId
    * @return
    */
   TaskReportStatistics getStatisticsCount(@Param("userId") Long userId, @Param("houseCode") String houseCode, @Param("neiCode") String neiCode);
   TaskReportStatistics getStatisticsCount(@Param("userId") Long userId,
                                 @Param("houseCode") String houseCode,
                                 @Param("regionChildCodesList") List<String> regionChildCodesList,
                                 @Param("isAdministrator") Integer isAdministrator);

   Integer getStatistics(Long userId,String neiCode);
   Integer getStatistics(Long userId, String neiCode, String roleName);

   /**
    * 更新状态--临时接口