diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java index 332d10e..c3e85b1 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java @@ -32,7 +32,7 @@ public class AppFireCheckListController { public PageResponse checkList(@RequestBody FireCheckListPageQry qry) { return fireCheckListService.appCheckList(qry); } - @ApiOperation("获取待排查数量") + @ApiOperation("获取待排查数量和打回数量") @PostMapping("/checkListCount") public SingleResponse checkListCount(@RequestBody FireCheckListPageQry qry) { return SingleResponse.of(fireCheckListService.checkListCount(qry)); diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java index 842a59a..577d9f0 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java @@ -152,12 +152,22 @@ public class FireCheckListQueryExe { } public Integer checkListCount(FireCheckListPageQry qry) { + + //待办数 Map params = PageQueryHelper.toHashMap(qry); PageResponse pageResponse = fireCheckListRepository.appCheckList(params); - if (CollUtil.isEmpty(pageResponse.getData())) { + + //打回的数量 + + Map backParams = PageQueryHelper.toHashMap(qry); + backParams.put("userId",AuthContext.getUserId()); + PageResponse backPageResponse = fireCheckListRepository.getBackChecKList(backParams); + + + if (CollUtil.isEmpty(pageResponse.getData()) && CollUtil.isEmpty(backPageResponse.getData())) { return 0; }else{ - return pageResponse.getTotalCount(); + return pageResponse.getTotalCount()+backPageResponse.getTotalCount(); } }