案卷资料清单上传接口修改
This commit is contained in:
parent
0bbffc9772
commit
698b542cd3
|
|
@ -35,15 +35,7 @@ public class CaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询案件信息
|
* 分页查询案件信息
|
||||||
*
|
|
||||||
* @param query 案件数据项查询条件
|
|
||||||
* @return 分页案件信息
|
|
||||||
*/
|
|
||||||
@GetMapping
|
|
||||||
public PageResult<Case> getCasesPage(CaseQuery query, @CurrentUser RemoteUserInfo user) {
|
|
||||||
Page<Case> page = caseService.findCasesPage(query, user);
|
|
||||||
return PageResult.of(page);
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* 查询案件信息(单条)
|
* 查询案件信息(单条)
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -79,15 +79,7 @@ public class CaseService {
|
||||||
*
|
*
|
||||||
* @param query@return 分页案件信息
|
* @param query@return 分页案件信息
|
||||||
*/
|
*/
|
||||||
@Transactional(readOnly = true)
|
|
||||||
public Page<Case> 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) {
|
private Case handleResult(Case caseInfoDto) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue