diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java index 8e04bab..90910c1 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java @@ -35,15 +35,7 @@ public class CaseController { /** * 分页查询案件信息 - * - * @param query 案件数据项查询条件 - * @return 分页案件信息 - */ - @GetMapping - public PageResult getCasesPage(CaseQuery query, @CurrentUser RemoteUserInfo user) { - Page page = caseService.findCasesPage(query, user); - return PageResult.of(page); - } + /** * 查询案件信息(单条) * diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java index d1cf909..f2a16cf 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java @@ -79,15 +79,7 @@ public class CaseService { * * @param query@return 分页案件信息 */ - @Transactional(readOnly = true) - public Page findCasesPage(CaseQuery query, RemoteUserInfo user) { - if ("zfwsquery".equals(query.getSpecialCondition())) - return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::handleResult); - if (query.getStatus() != null && ("filed".equals(query.getStatus().getValue()) || "investigation_done".equals(query.getStatus().getValue()))) - return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::getCaseevidenceDetailInfo); - else - return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::getCaseDetailInfo); - } + private Case handleResult(Case caseInfoDto) {