lrj 7 місяців тому
батько
коміт
b7aadadef0

+ 1 - 0
src/main/java/cn/cslg/pas/controller/PatentDigProjectController.java

@@ -40,6 +40,7 @@ public class PatentDigProjectController {
     @Autowired
     private BusinessFactory businessFactory;
 
+
     @Operation(summary = "查询专利挖掘项目")
     @PostMapping("/queryPatentDigProject")
     public Response queryPatentDigProject(@RequestBody StringRequest stringRequest) throws Exception {

+ 1 - 1
src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetningdeTempalte.java

@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
  */
 @Component
 public class GetningdeTempalte implements GetTemplateMapsImp {
+
     @Autowired
     private EsPatentService esPatentService;
-
     @Override
     public Map<String, Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs, TechnicalCaseVO technicalCaseVO, List<CompareLiteratureVO> compareLiteratureVOS, List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS, List<RetrieveRecordVO> retrieveRecordVOS,PersonnelVO personnelVO) {
         Map<String, Object> map = new HashMap<>();

+ 4 - 2
src/main/java/cn/cslg/pas/service/business/PatentDigProjectFilesService.java

@@ -401,8 +401,8 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
                 LambdaQueryWrapper<AssoHandleResultFile> queryWrapper4 = new LambdaQueryWrapper<>();
                 queryWrapper4.in(AssoHandleResultFile::getTaskHandleResultId, resultIds);
                 List<AssoHandleResultFile> assoHandleResultFiles = assoHandleResultFileService.list(queryWrapper4);
-
                 for (TaskHandleResult taskHandleResult : taskHandleResults) {
+                    ProjectTask projectTask = projectTasks.stream().filter(item -> item.getId().equals(taskHandleResult.getTaskId())).findFirst().orElse(null);
                     Integer resultId = taskHandleResult.getId();
                     List<AssoHandleResultFile> assoHandleResultFiletemps = assoHandleResultFiles.stream().filter(item -> item.getTaskHandleResultId().equals(resultId)).collect(Collectors.toList());
                     assoHandleResultFiletemps.forEach(item -> {
@@ -411,7 +411,9 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
                         patentDigProjectFilesVO.setProjectId(projectId);
                         patentDigProjectFilesVO.setFileGuid(item.getFileGuid());
                         patentDigProjectFilesVO.setCreateId(item.getCreateId());
-                        patentDigProjectFilesVO.setProcessId(processId);
+                        if (projectTask != null) {
+                            patentDigProjectFilesVO.setProcessId(projectTask.getProcessId());
+                        }
                         patentDigProjectFilesVO.setCreateTime(item.getCreateTime());
                         patentDigProjectFilesVO.setSource(2);
                         patentDigProjectFilesVOS.add(patentDigProjectFilesVO);