Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/cslg/pas/service/business/es/EsService.java

src/main/java/cn/cslg/pas/common/vo/business/PatentDigProjectFilesVO.java

@@ -53,7 +53,7 @@ public class PatentDigProjectFilesVO {
     /**
      * 发生时间
      */
-    private Date event_date;
+    private Date eventDate;
 
     /**
      * 文件类型

src/main/java/cn/cslg/pas/controller/PatentDigProjectFilesController.java

@@ -14,13 +14,11 @@ import cn.cslg.pas.service.business.PatentDigProjectFilesService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 专利挖掘文件Controller层
@@ -78,4 +76,11 @@ public class PatentDigProjectFilesController {
         Integer taskId = patentDigProjectFilesService.addPDProjectFilesTask(patentDigProjectFilesDTO);
         return Response.success(taskId);
     }
+
+    @Operation(summary = "查询所属流程的任务与文件数量")
+    @GetMapping("/getCountOfProcess")
+    public Response getCountOfProcess(Integer projectId){
+        Map<Integer, Map<String, Integer>> countMap = patentDigProjectFilesService.getProcessInfo(projectId);
+        return Response.success(countMap);
+    }
 }

src/main/java/cn/cslg/pas/controller/ProjectTaskController.java

@@ -13,6 +13,7 @@ import cn.cslg.pas.service.business.ProjectTaskService;
 import cn.cslg.pas.service.business.TaskHandleResultService;
 import cn.hutool.http.HttpStatus;
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.constraints.PastOrPresent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -81,7 +82,7 @@ public class ProjectTaskController {
     @GetMapping("/queryAuditHistory")
     public Response queryAuditHistory(Integer taskId) throws IOException {
         //查询审核历史就是根据taskId,查询所有关联任务的信息
-        TaskDetailsVO taskDetailsVO =  projectTaskService.queryAuditHistory(taskId);
+        TaskDetailsVO taskDetailsVO =  projectTaskService.getAuditHistory(taskId);
         return Response.success(taskDetailsVO);
     }
 
@@ -103,7 +104,6 @@ public class ProjectTaskController {
             return Response.error("失败");
         }
     }
-
 //    @Operation(summary = "查询任务与附件关联")
 //    @PostMapping("/getAssoTaskFile")
 //    public Response getAssoTaskFile(@RequestBody GetAssoTaskFileDTO getAssoTaskFileDTO) throws IOException {

src/main/java/cn/cslg/pas/domain/business/PatentDigProjectFiles.java

@@ -59,8 +59,8 @@ public class PatentDigProjectFiles extends BaseEntity<PatentDigProjectFiles> {
     /**
      * 发生时间
      */
-    @TableField(value = "eventDate")
-    private Date event_date;
+    @TableField(value = "event_date")
+    private Date eventDate;
 
     /**
      * 文件类型

src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/MatchPhasePrefixQueryBuilder.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 
 @Component
-public class MatchPhasePrefixQueryBuilder implements IQueryBuilder{
+public class PrefixQueryBuilder implements IQueryBuilder{
     private String field = "";
     private String value = "";
     private String operator = "";
@@ -15,7 +15,7 @@ public class MatchPhasePrefixQueryBuilder implements IQueryBuilder{
 
     @Override
     public Query creteQuery() throws ParseException {
-        return QueryBuilders.matchPhrasePrefix(i -> i.field(field).query(value));
+        return QueryBuilders.prefix(i -> i.field(field).value(value));
     }
 
     public String getField() {

src/main/java/cn/cslg/pas/service/business/PatentDigProjectFilesService.java

@@ -11,6 +11,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.business.PatentDigProjectFilesVO;
 import cn.cslg.pas.domain.business.PatentDigProjectFiles;
+import cn.cslg.pas.domain.business.ProjectTask;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
@@ -233,6 +234,8 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
         //首先调用新增文件接口
         List<Integer> ids = (List<Integer>) this.addMessage(patentDigProjectFilesDTO);
         //其次调用新增任务接口
+        patentDigProjectFilesDTO.getProjectTaskDTO().setProjectId(patentDigProjectFilesDTO.getProjectId());
+        patentDigProjectFilesDTO.getProjectTaskDTO().setProcessId(patentDigProjectFilesDTO.getProcessId());
         Integer taskId = projectTaskService.addTask(patentDigProjectFilesDTO.getProjectTaskDTO());
         if (!ids.isEmpty()) {
             LambdaQueryWrapper<PatentDigProjectFiles> queryWrapper = new LambdaQueryWrapper<>();
@@ -247,4 +250,21 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
         }
         return taskId;
     }
+
+    public Map<Integer, Map<String, Integer>> getProcessInfo(Integer projectId){
+        Map<Integer, Map<String, Integer>> processInfo = new HashMap<>();
+        for (int i = 1; i < 8; i++) {
+            LambdaQueryWrapper<ProjectTask> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ProjectTask::getProcessId, i).eq(ProjectTask::getProjectId, projectId);
+            Integer taskCount = (int) projectTaskService.count(queryWrapper);
+            LambdaQueryWrapper<PatentDigProjectFiles> queryWrapper1 = new LambdaQueryWrapper<>();
+            queryWrapper1.eq(PatentDigProjectFiles::getProcessId, i).eq(PatentDigProjectFiles::getProjectId, projectId);
+            Integer fileCount = (int) this.count(queryWrapper1);
+            Map<String, Integer> countMap = new HashMap<>();
+            countMap.put("taskCount", taskCount);
+            countMap.put("fileCount", fileCount);
+            processInfo.put(i, countMap);
+        }
+        return processInfo;
+    }
 }

src/main/java/cn/cslg/pas/service/business/ProjectTaskService.java

@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -136,9 +137,12 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         //设置任务的发起人
         projectTask.setCreateId(personnelVO.getId());
         projectTask.insert();
-        if (projectTask.getAssoTaskId() == null && projectTask.getType() == 6) {
-            projectTask.setAssoTaskId(projectTask.getId());
-            projectTask.updateById();
+        if (projectTask.getAssoTaskId() == null) {
+            if (projectTask.getType() == 6 || projectTask.getType() == 7) {
+                projectTask.setAssoTaskId(projectTask.getId());
+                projectTask.updateById();
+            }
+
         }
         //新增任务可能会上传附件，如果附件不为空，则添加任务与附件关联
         if (projectTaskDTO.getFileGuids() != null) {
@@ -240,14 +244,10 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
     public TaskDetailsVO queryAuditHistory(Integer taskId) throws IOException {
         //新建返回VO类
         TaskDetailsVO taskDetailsVO = new TaskDetailsVO();
+        List<HandleResultFileVO> handleResultFileVOS = new ArrayList<>();
+        List<AuditHistoryVO> auditHistoryVOS = new ArrayList<>();
         //根据taskId查询此条任务详情
-        LambdaQueryWrapper<ProjectTask> currentTaskWrapper = new LambdaQueryWrapper<>();
-        currentTaskWrapper.eq(ProjectTask::getId, taskId);
-        List<ProjectTask> currentTasks = this.list(currentTaskWrapper);
-        ProjectTask currentTask = new ProjectTask();
-        if (currentTasks != null && currentTasks.size() != 0) {
-            currentTask = currentTasks.get(0);
-        }
+        ProjectTask currentTask = this.getById(taskId);
         //根据此条任务详情获取assoTaskId
         Integer assoTaskId = currentTask.getAssoTaskId();
         List<ProjectTask> allProjectTasks = new ArrayList<>();
@@ -255,39 +255,72 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
             //根据assoTaskId获取最初任务的详情
             LambdaQueryWrapper<ProjectTask> assoTaskWrapper = new LambdaQueryWrapper<>();
             assoTaskWrapper.eq(ProjectTask::getId, assoTaskId);
-            ProjectTask assoTask = this.list(assoTaskWrapper).get(0);
-            //装载最初任务详情
             ProjectTaskVO projectTaskVO = new ProjectTaskVO();
-            BeanUtils.copyProperties(assoTask, projectTaskVO);
-            taskDetailsVO.setProjectTaskVO(projectTaskVO);
-            //根据assoTaskId查询所有任务的id
-            LambdaQueryWrapper<ProjectTask> allTaskWrapper = new LambdaQueryWrapper<>();
-            allTaskWrapper.eq(ProjectTask::getAssoTaskId, assoTaskId);
-            allProjectTasks = this.list(allTaskWrapper);
+            ProjectTask assoTask = this.list(assoTaskWrapper).get(0);
+            if (assoTask != null) {
+                //装载最初任务详情
+                BeanUtils.copyProperties(assoTask, projectTaskVO);
+                taskDetailsVO.setProjectTaskVO(projectTaskVO);
+                if (assoTask.getType() == 7) {
+                    //专利挖掘文件任务
+                    LambdaQueryWrapper<PatentDigProjectFiles> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(PatentDigProjectFiles::getTaskId, assoTask.getId());
+                    List<PatentDigProjectFiles> patentDigProjectFiles = patentDigProjectFilesService.list(queryWrapper);
+                    List<String> fileGuids = new ArrayList<>();
+                    List<SystemFile> systemFiles = new ArrayList<>();
+                    if (!patentDigProjectFiles.isEmpty()) {
+                        fileGuids = patentDigProjectFiles.stream().map(PatentDigProjectFiles::getFileGuid).collect(Collectors.toList());
+                    }
+                    //调用文件系统查询文件信息接口
+                    if (!fileGuids.isEmpty()) {
+                        String res = fileManagerService.getSystemFileFromFMS(fileGuids);
+                        systemFiles = JSONObject.parseArray(res, SystemFile.class);
+                    }
+                    if (!systemFiles.isEmpty()) {
+                        for (PatentDigProjectFiles patentDigProjectFiles1 : patentDigProjectFiles) {
+                            HandleResultFileVO handleResultFileVO = new HandleResultFileVO();
+                            //装载文件信息
+                            SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(patentDigProjectFiles1.getFileGuid())).findFirst().orElse(null);
+                            if (systemFile != null) {
+                                BeanUtils.copyProperties(patentDigProjectFiles1, handleResultFileVO);
+                                handleResultFileVO.setGuid(patentDigProjectFiles1.getFileGuid());
+                                handleResultFileVO.setType(systemFile.getType());
+                                handleResultFileVO.setOriginalName(systemFile.getOriginalName());
+                            }
+                            handleResultFileVOS.add(handleResultFileVO);
+                        }
+                    }
+                }
+                //根据assoTaskId查询所有任务的id
+                LambdaQueryWrapper<ProjectTask> allTaskWrapper = new LambdaQueryWrapper<>();
+                allTaskWrapper.eq(ProjectTask::getAssoTaskId, assoTaskId);
+                allProjectTasks = this.list(allTaskWrapper);
+            }
         }
-        //新建审核历史返回VO以及集合
-        List<AuditHistoryVO> auditHistoryVOS = new ArrayList<>();
+        //审核历史返回VO以及集合
         if (allProjectTasks != null) {
            for (ProjectTask item : allProjectTasks) {
                if (item != null) {
-                   AuditHistoryVO auditHistoryVO = new AuditHistoryVO();
-                   //任务详情VO
-                   ProjectTaskVO auditHistoryTaskVO = new ProjectTaskVO();
-                   BeanUtils.copyProperties(item, auditHistoryTaskVO);
-                   //处理结果VO
-                   TaskHandleResultVO taskHandleResultVO = new TaskHandleResultVO();
-                   LambdaQueryWrapper<TaskHandleResult> queryWrapper = new LambdaQueryWrapper<>();
-                   queryWrapper.eq(TaskHandleResult::getTaskId, item.getId());
-                   List<TaskHandleResult> taskHandleResults = taskHandleResultService.list(queryWrapper);
-                   if (taskHandleResults.size() != 0) {
-                       TaskHandleResult taskHandleResult = taskHandleResults.get(0);
-                       if (taskHandleResult != null) {
-                           BeanUtils.copyProperties(taskHandleResult, taskHandleResultVO);
-                           auditHistoryVO.setProjectTaskVO(auditHistoryTaskVO);
-                           auditHistoryVO.setTaskHandleResultVO(taskHandleResultVO);
+                   if (item.getId() != item.getAssoTaskId()) {
+                       AuditHistoryVO auditHistoryVO = new AuditHistoryVO();
+                       //任务详情VO
+                       ProjectTaskVO auditHistoryTaskVO = new ProjectTaskVO();
+                       BeanUtils.copyProperties(item, auditHistoryTaskVO);
+                       //处理结果VO
+                       TaskHandleResultVO taskHandleResultVO = new TaskHandleResultVO();
+                       LambdaQueryWrapper<TaskHandleResult> queryWrapper = new LambdaQueryWrapper<>();
+                       queryWrapper.eq(TaskHandleResult::getTaskId, item.getId());
+                       List<TaskHandleResult> taskHandleResults = taskHandleResultService.list(queryWrapper);
+                       if (taskHandleResults.size() != 0) {
+                           TaskHandleResult taskHandleResult = taskHandleResults.get(0);
+                           if (taskHandleResult != null) {
+                               BeanUtils.copyProperties(taskHandleResult, taskHandleResultVO);
+                               auditHistoryVO.setProjectTaskVO(auditHistoryTaskVO);
+                               auditHistoryVO.setTaskHandleResultVO(taskHandleResultVO);
+                           }
                        }
+                       auditHistoryVOS.add(auditHistoryVO);
                    }
-                   auditHistoryVOS.add(auditHistoryVO);
                }
             }
             taskDetailsVO.setAuditHistoryVOS(auditHistoryVOS);
@@ -298,28 +331,160 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         queryWrapper.in(TaskHandleResult::getTaskId, allTaskIds);
         List<TaskHandleResult> taskHandleResults = taskHandleResultService.list(queryWrapper);
         List<Integer> resultIds = new ArrayList<>();
-        if (taskHandleResults != null && taskHandleResults.size() != 0) {
+        if (taskHandleResults != null && !taskHandleResults.isEmpty()) {
             resultIds = taskHandleResults.stream().map(TaskHandleResult::getId).collect(Collectors.toList());
         }
-        List<HandleResultFileVO> handleResultFileVOS = new ArrayList<>();
         //根据所有的结果ids查询所有fileGuids
-        if (resultIds != null) {
+        if (resultIds != null && !resultIds.isEmpty()) {
             LambdaQueryWrapper<AssoHandleResultFile> allGuidsWrapper = new LambdaQueryWrapper<>();
             allGuidsWrapper.in(AssoHandleResultFile::getTaskHandleResultId, resultIds);
             List<AssoHandleResultFile> assoHandleResultFiles = assoHandleResultFileService.list(allGuidsWrapper);
-            //新建
             List<String> fileGuids = new ArrayList<>();
             List<SystemFile> systemFiles = new ArrayList<>();
+            if (!assoHandleResultFiles.isEmpty()) {
+                fileGuids = assoHandleResultFiles.stream().map(AssoHandleResultFile::getFileGuid).collect(Collectors.toList());
+            }
+            //调用文件系统查询文件信息接口
+            if (!fileGuids.isEmpty()) {
+                String res = fileManagerService.getSystemFileFromFMS(fileGuids);
+                systemFiles = JSONObject.parseArray(res, SystemFile.class);
+            }
+            if (!systemFiles.isEmpty()) {
+                for (AssoHandleResultFile assoHandleResultFile : assoHandleResultFiles) {
+                    HandleResultFileVO handleResultFileVO = new HandleResultFileVO();
+                    //装载文件信息
+                    SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(assoHandleResultFile.getFileGuid())).findFirst().orElse(null);
+                    if (systemFile != null) {
+                        BeanUtils.copyProperties(assoHandleResultFile, handleResultFileVO);
+                        handleResultFileVO.setGuid(assoHandleResultFile.getFileGuid());
+                        handleResultFileVO.setType(systemFile.getType());
+                        handleResultFileVO.setOriginalName(systemFile.getOriginalName());
+                    }
+                    handleResultFileVOS.add(handleResultFileVO);
+                }
+            }
+        }
+        taskDetailsVO.setSystemFileList(handleResultFileVOS);
+        //装载名称
+        this.loadTaskDetails(taskDetailsVO);
+        return taskDetailsVO;
+    }
 
-            if (assoHandleResultFiles.size() != 0) {
+
+    /**
+     * 根据任务id查询任务详情以及处理结果以及审核历史
+     * @param taskId
+     * @return
+     */
+    public TaskDetailsVO getAuditHistory(Integer taskId) throws IOException {
+        //新建返回VO类
+        TaskDetailsVO taskDetailsVO = new TaskDetailsVO();
+        List<HandleResultFileVO> handleResultFileVOS = new ArrayList<>();
+        List<AuditHistoryVO> auditHistoryVOS = new ArrayList<>();
+        //根据taskId查询此条任务详情
+        ProjectTask currentTask = this.getById(taskId);
+        //根据此条任务详情获取assoTaskId
+        //使用Optional避免空指针异常：使用Optional来处理可能为空的变量，例如currentTask和assoTask。
+        Optional<ProjectTask> currentTaskOptional = Optional.ofNullable(currentTask);
+        Integer assoTaskId = currentTaskOptional.map(ProjectTask::getAssoTaskId).orElse(null);
+        List<ProjectTask> allProjectTasks = new ArrayList<>();
+        if (assoTaskId != null) {
+            //根据assoTaskId获取最初任务的详情
+            LambdaQueryWrapper<ProjectTask> assoTaskWrapper = new LambdaQueryWrapper<>();
+            assoTaskWrapper.eq(ProjectTask::getId, assoTaskId);
+            ProjectTaskVO projectTaskVO = new ProjectTaskVO();
+            ProjectTask assoTask = this.list(assoTaskWrapper).get(0);
+            if (assoTask != null) {
+                //装载最初任务详情
+                BeanUtils.copyProperties(assoTask, projectTaskVO);
+                taskDetailsVO.setProjectTaskVO(projectTaskVO);
+                if (assoTask.getType() == 7) {
+                    //专利挖掘文件任务
+                    LambdaQueryWrapper<PatentDigProjectFiles> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(PatentDigProjectFiles::getTaskId, assoTask.getId());
+                    List<PatentDigProjectFiles> patentDigProjectFiles = patentDigProjectFilesService.list(queryWrapper);
+                    List<String> fileGuids = new ArrayList<>();
+                    List<SystemFile> systemFiles = new ArrayList<>();
+                    if (!patentDigProjectFiles.isEmpty()) {
+                        fileGuids = patentDigProjectFiles.stream().map(PatentDigProjectFiles::getFileGuid).collect(Collectors.toList());
+                    }
+                    //调用文件系统查询文件信息接口
+                    if (!fileGuids.isEmpty()) {
+                        String res = fileManagerService.getSystemFileFromFMS(fileGuids);
+                        systemFiles = JSONObject.parseArray(res, SystemFile.class);
+                    }
+                    if (!systemFiles.isEmpty()) {
+                        for (PatentDigProjectFiles patentDigProjectFiles1 : patentDigProjectFiles) {
+                            HandleResultFileVO handleResultFileVO = new HandleResultFileVO();
+                            //装载文件信息
+                            SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(patentDigProjectFiles1.getFileGuid())).findFirst().orElse(null);
+                            if (systemFile != null) {
+                                BeanUtils.copyProperties(patentDigProjectFiles1, handleResultFileVO);
+                                handleResultFileVO.setGuid(patentDigProjectFiles1.getFileGuid());
+                                handleResultFileVO.setType(systemFile.getType());
+                                handleResultFileVO.setOriginalName(systemFile.getOriginalName());
+                            }
+                            handleResultFileVOS.add(handleResultFileVO);
+                        }
+                    }
+                }
+                //根据assoTaskId查询所有任务的id
+                LambdaQueryWrapper<ProjectTask> allTaskWrapper = new LambdaQueryWrapper<>();
+                allTaskWrapper.eq(ProjectTask::getAssoTaskId, assoTaskId);
+                allProjectTasks = this.list(allTaskWrapper);
+            }
+        }
+        //审核历史返回VO以及集合
+        if (allProjectTasks != null) {
+            taskDetailsVO.setAuditHistoryVOS(allProjectTasks.stream()
+                    .filter(item -> item.getId() != item.getAssoTaskId())
+                    .map(item -> {
+                        AuditHistoryVO auditHistoryVO = new AuditHistoryVO();
+                        ProjectTaskVO auditHistoryTaskVO = new ProjectTaskVO();
+                        BeanUtils.copyProperties(item, auditHistoryTaskVO);
+                        //处理结果VO
+                        TaskHandleResultVO taskHandleResultVO = new TaskHandleResultVO();
+                        LambdaQueryWrapper<TaskHandleResult> queryWrapper = new LambdaQueryWrapper<>();
+                        queryWrapper.eq(TaskHandleResult::getTaskId, item.getId());
+                        List<TaskHandleResult> taskHandleResults = taskHandleResultService.list(queryWrapper);
+                        if (taskHandleResults.size() != 0) {
+                            TaskHandleResult taskHandleResult = taskHandleResults.get(0);
+                            if (taskHandleResult != null) {
+                                BeanUtils.copyProperties(taskHandleResult, taskHandleResultVO);
+                                auditHistoryVO.setProjectTaskVO(auditHistoryTaskVO);
+                                auditHistoryVO.setTaskHandleResultVO(taskHandleResultVO);
+                            }
+                        }
+                        auditHistoryVOS.add(auditHistoryVO);
+                        return auditHistoryVO;
+                    })
+                    .collect(Collectors.toList()));
+        }
+        //全部的文件信息(获取所有的任务的id，查出所有的结果id)
+        List<Integer> allTaskIds = allProjectTasks.stream().map(ProjectTask::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<TaskHandleResult> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(TaskHandleResult::getTaskId, allTaskIds);
+        List<TaskHandleResult> taskHandleResults = taskHandleResultService.list(queryWrapper);
+        List<Integer> resultIds = new ArrayList<>();
+        if (taskHandleResults != null && !taskHandleResults.isEmpty()) {
+            resultIds = taskHandleResults.stream().map(TaskHandleResult::getId).collect(Collectors.toList());
+        }
+        //根据所有的结果ids查询所有fileGuids
+        if (resultIds != null && !resultIds.isEmpty()) {
+            LambdaQueryWrapper<AssoHandleResultFile> allGuidsWrapper = new LambdaQueryWrapper<>();
+            allGuidsWrapper.in(AssoHandleResultFile::getTaskHandleResultId, resultIds);
+            List<AssoHandleResultFile> assoHandleResultFiles = assoHandleResultFileService.list(allGuidsWrapper);
+            List<String> fileGuids = new ArrayList<>();
+            List<SystemFile> systemFiles = new ArrayList<>();
+            if (!assoHandleResultFiles.isEmpty()) {
                 fileGuids = assoHandleResultFiles.stream().map(AssoHandleResultFile::getFileGuid).collect(Collectors.toList());
             }
             //调用文件系统查询文件信息接口
-            if (fileGuids.size() != 0) {
+            if (!fileGuids.isEmpty()) {
                 String res = fileManagerService.getSystemFileFromFMS(fileGuids);
                 systemFiles = JSONObject.parseArray(res, SystemFile.class);
             }
-            if (systemFiles.size() != 0) {
+            if (!systemFiles.isEmpty()) {
                 for (AssoHandleResultFile assoHandleResultFile : assoHandleResultFiles) {
                     HandleResultFileVO handleResultFileVO = new HandleResultFileVO();
                     //装载文件信息

src/main/resources/jsons/patent.json

@@ -317,7 +317,7 @@
     "value": "appProvince",
     "field": "appProvince",
     "esField": "applicant_addr.province",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -329,7 +329,7 @@
     "value": "appCity",
     "field": "appCity",
     "esField": "applicant_addr.city",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -341,7 +341,7 @@
     "value": "appDistrict",
     "field": "appDistrict",
     "esField": "applicant_addr.district",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -377,7 +377,7 @@
     "value": "rightProvince",
     "field": "rightProvince",
     "esField": "right_holder_addr.province",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -389,7 +389,7 @@
     "value": "rightCity",
     "field": "rightCity",
     "esField": "right_holder_addr.city",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -401,7 +401,7 @@
     "value": "rightDistrict",
     "field": "rightDistrict",
     "esField": "right_holder_addr.district",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -413,7 +413,7 @@
     "value": "MC",
     "field": "MC",
     "esField": "mipc",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -424,7 +424,7 @@
     "type": "String",
     "value": "mipcLevel1",
     "field": "mipcLevel1",
-    "esField": "mipc.level1",
+    "esField": "mipc.level1.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -436,7 +436,7 @@
     "type": "String",
     "value": "mipcLevel2",
     "field": "mipcLevel2",
-    "esField": "mipc.level2",
+    "esField": "mipc.level2.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -448,7 +448,7 @@
     "type": "String",
     "value": "mipcLevel3",
     "field": "mipcLevel3",
-    "esField": "mipc.level3",
+    "esField": "mipc.level3.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -460,7 +460,7 @@
     "type": "String",
     "value": "mipcLevel4",
     "field": "mipcLevel4",
-    "esField": "mipc.level4",
+    "esField": "mipc.level4.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -472,7 +472,7 @@
     "type": "String",
     "value": "mipcLevel5",
     "field": "mipcLevel5",
-    "esField": "mipc.level5",
+    "esField": "mipc.level5.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -126,7 +126,9 @@ public class EventServiceTests {
 //        mapRequest.setSize(50L);
 //        mapRequest.setProjectId(1);
         StringRequest stringRequest = new StringRequest();
-        stringRequest.setSearchQuery("agent=李桂存");
+        stringRequest.setSearchQuery("appCity=济南");
+//        stringRequest.setSearchQuery("mipcLevel1=H");
+//        stringRequest.setSearchQuery("agent=李桂存");
 //        stringRequest.setSearchQuery("IN=郝旭东");
 //        stringRequest.setSearchQuery("simpleStatus=3");
 //        stringRequest.setSearchQuery("CL=一种考虑电流限制和出力水平的分布式光伏机电暂态建模方法");
@@ -156,6 +158,10 @@ public class EventServiceTests {
         //2.调用查询取第一页（5笔一页)
         //3.判断5笔数据是正确的；
         //4.删除测试数据
+        List<Integer> list = Arrays.asList(1, 2, 3, 4);
+        List<Integer> list1 = Arrays.asList(4, 5);
+//        list1.removeAll(list);
+        System.out.println(list1);
     }
 
     @Test
@@ -184,4 +190,11 @@ public class EventServiceTests {
         EsPatentFamilyDTO test = esService.addEsPatentFamily(stringList, "test");
         System.out.println(test);
     }
+
+    @Test
+    void test4() throws IOException {
+        List<String> stringList = Arrays.asList("US369258147", "US258369147", "14528");
+        EsPatentFamilyDTO test = esService.selectEsPatentFamily(stringList, "test");
+        System.out.println(test);
+    }
 }

src/test/java/cn/cslg/pas/service/ProjectTaskServiceTests.java

@@ -4,7 +4,9 @@ import cn.cslg.pas.common.model.request.OrderDTO;
 import cn.cslg.pas.common.model.request.StringGroupRequest;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.controller.EventController;
+import cn.cslg.pas.controller.PatentDigProjectFilesController;
 import cn.cslg.pas.controller.ProjectTaskController;
+import cn.cslg.pas.service.business.PatentDigProjectFilesService;
 import cn.cslg.pas.service.business.PatentNoSplitterService;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
@@ -32,6 +34,9 @@ public class ProjectTaskServiceTests {
     @Autowired
     private PatentNoSplitterService patentNoSplitterService;
 
+    @Autowired
+    private PatentDigProjectFilesService patentDigProjectFilesService;
+
 
 
     @Test
@@ -80,5 +85,13 @@ public class ProjectTaskServiceTests {
 //        System.out.println(results);
     }
 
+    @Test
+        void getProcess(){
+        Integer projectId = 67;
+        Map<Integer, Map<String, Integer>> countMap = patentDigProjectFilesService.getProcessInfo(projectId);
+        System.out.println(countMap);
+    }
+
+
 
 }