更新档案模块

archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java

@@ -31,9 +31,9 @@ public class ArchivesController {
     @ApiOperation("档案列表")
     @GetMapping("/initArchivesView")
     public ApiResponse<Object> 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("档案预编辑")

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);
     //编辑档案

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<ArchivesType> optional = archivesTypeRepository.findById(categoryId);
         if(!optional.isPresent())
             return "未查询到到门类信息！";
         ArchivesType archivesType = optional.get();
         List<String> 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<Object[]> countList = entityManager.createNativeQuery("select count(1) from "+queryTable+additional).getResultList();
+        List<Object[]> countList = entityManager.createNativeQuery("select count(1) from "+queryTable+additional).getResultList();
         Object count = countList.get(0);
         List<Object[]> list = entityManager.createNativeQuery("select "+queryField+" from "+queryTable+additional+quertOrder).getResultList();
         List<Map> returnlist = new ArrayList<>();