修改待办数量统计
parent
e53f3ebf7c
commit
725747cc82
|
|
@ -32,7 +32,7 @@ public class AppFireCheckListController {
|
||||||
public PageResponse<FireCheckListCO> checkList(@RequestBody FireCheckListPageQry qry) {
|
public PageResponse<FireCheckListCO> checkList(@RequestBody FireCheckListPageQry qry) {
|
||||||
return fireCheckListService.appCheckList(qry);
|
return fireCheckListService.appCheckList(qry);
|
||||||
}
|
}
|
||||||
@ApiOperation("获取待排查数量")
|
@ApiOperation("获取待排查数量和打回数量")
|
||||||
@PostMapping("/checkListCount")
|
@PostMapping("/checkListCount")
|
||||||
public SingleResponse<Integer> checkListCount(@RequestBody FireCheckListPageQry qry) {
|
public SingleResponse<Integer> checkListCount(@RequestBody FireCheckListPageQry qry) {
|
||||||
return SingleResponse.of(fireCheckListService.checkListCount(qry));
|
return SingleResponse.of(fireCheckListService.checkListCount(qry));
|
||||||
|
|
|
||||||
|
|
@ -152,12 +152,22 @@ public class FireCheckListQueryExe {
|
||||||
|
|
||||||
}
|
}
|
||||||
public Integer checkListCount(FireCheckListPageQry qry) {
|
public Integer checkListCount(FireCheckListPageQry qry) {
|
||||||
|
|
||||||
|
//待办数
|
||||||
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||||
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.appCheckList(params);
|
PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.appCheckList(params);
|
||||||
if (CollUtil.isEmpty(pageResponse.getData())) {
|
|
||||||
|
//打回的数量
|
||||||
|
|
||||||
|
Map<String, Object> backParams = PageQueryHelper.toHashMap(qry);
|
||||||
|
backParams.put("userId",AuthContext.getUserId());
|
||||||
|
PageResponse<FireCheckListDO> backPageResponse = fireCheckListRepository.getBackChecKList(backParams);
|
||||||
|
|
||||||
|
|
||||||
|
if (CollUtil.isEmpty(pageResponse.getData()) && CollUtil.isEmpty(backPageResponse.getData())) {
|
||||||
return 0;
|
return 0;
|
||||||
}else{
|
}else{
|
||||||
return pageResponse.getTotalCount();
|
return pageResponse.getTotalCount()+backPageResponse.getTotalCount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue