From 1ea4c51595200b82411b8f396f4f6f81b99e7a7b Mon Sep 17 00:00:00 2001 From: xia Date: Wed, 15 Jun 2022 10:24:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/archives/controller/ArchivesController.java | 4 ++-- .../modules/archives/service/ArchivesService.java | 2 +- .../archives/service/impl/ArchivesServiceImpl.java | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java index 646c06a..01d6213 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java @@ -31,9 +31,9 @@ public class ArchivesController { @ApiOperation("档案列表") @GetMapping("/initArchivesView") public ApiResponse initArchivesView( - String categoryId,String query,boolean isdel,Pageable page + String categoryId,String query,Integer archivesState,boolean isdel,Pageable page ){ - return ApiResponse.success(archivesService.initArchivesView(categoryId,query,isdel,page)); + return ApiResponse.success(archivesService.initArchivesView(categoryId,query,archivesState,isdel,page)); } @ApiOperation("档案预编辑") diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java index 49be169..8e17eb5 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java @@ -7,7 +7,7 @@ public interface ArchivesService { //初始化档案列表标题 Object initArchivesViewTable(String categoryId); //初始化档案列表 - Object initArchivesView(String categoryId, String query, boolean isdel,Pageable page); + Object initArchivesView(String categoryId, String query,Integer archivesState, boolean isdel,Pageable page); //预编辑档案 初始化信息 Object doedit(String categoryId,String archivesId); //编辑档案 diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java index 6d45486..24d5ee7 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java @@ -45,13 +45,15 @@ public class ArchivesServiceImpl implements ArchivesService { } @Override - public Object initArchivesView(String categoryId, String query, boolean isdel,Pageable page) { + public Object initArchivesView(String categoryId, String query,Integer archivesState, boolean isdel,Pageable page) { Optional optional = archivesTypeRepository.findById(categoryId); if(!optional.isPresent()) return "未查询到到门类信息！"; ArchivesType archivesType = optional.get(); List queryFields = archivesDictionaryRepository.findDisPlayField(categoryId); queryFields.add("id"); + queryFields.add("tid"); + queryFields.add("case_no"); String queryField = queryFields.stream().map(String::valueOf).collect(Collectors.joining(",")); String queryTable = archivesType.getEnName(); String quertOrder = ""; @@ -62,10 +64,13 @@ public class ArchivesServiceImpl implements ArchivesService { quertOrder += splits[0].trim()+" "+splits[1].trim() +","; } String additional = isdel ? " where is_delete_time is not null " : " where is_delete_time is null "; + + additional = StringUtils.isEmpty(query) ? additional : additional + + "and (maintitle like '%"+query+"%' or archive_no like '%"+query+"%' or archive_year like '%"+query+"%') "; if(objects.length > 0) quertOrder = " order by " + quertOrder.substring(0,quertOrder.length()-1); - List countList = entityManager.createNativeQuery("select count(1) from "+queryTable+additional).getResultList(); + List countList = entityManager.createNativeQuery("select count(1) from "+queryTable+additional).getResultList(); Object count = countList.get(0); List list = entityManager.createNativeQuery("select "+queryField+" from "+queryTable+additional+quertOrder).getResultList(); List returnlist = new ArrayList<>();