3/6 修改查询侵权分析对比结果

src/main/java/cn/cslg/pas/common/utils/PatentRightUtils.java

@@ -339,7 +339,7 @@ public class PatentRightUtils {
         List<RePatentClaim> rePatentClaims = PatentRightUtils.formatPatentRight(params);
         if (rePatentClaims.size() > 0) {
             List<String> claims = rePatentClaims.stream().map(RePatentClaim::getContent).collect(Collectors.toList());
-            reStr = StringUtils.join(claims, "。\t");
+            reStr = StringUtils.join(claims, "\t");
         }
         return reStr;
     }

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

@@ -874,7 +874,20 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         Long current = comparedPatentDTO.getCurrent();
         Long size = comparedPatentDTO.getSize();
         //根据projectId 查询出对比过的专利号
-        List<String> patentNos = this.getBaseMapper().getComparedPatents(projectId, compareResult);
+        List<String> patentNos =new ArrayList<>();
+        //根据projectId 查询报告
+        LambdaQueryWrapper<ReportProject> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(ReportProject::getProjectId,projectId);
+        ReportProject reportProject =reportProjectService.getOne(queryWrapper,false);
+        if(reportProject==null){
+            throw new XiaoShiException("报告不存在");
+        }
+        if(reportProject.getReportType().equals(4)){
+            patentNos.add(reportProject.getSignPatentNo());
+        }
+        else {
+            patentNos = this.getBaseMapper().getComparedPatents(projectId, compareResult);
+        }
         List<ComparedPatentVO> comparedPatentVOS = new ArrayList<>();
         //根据专利号查询专利信息
         List<Patent> patents = new ArrayList<>();
@@ -887,6 +900,10 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
                 patents.forEach(item -> {
                     ComparedPatentVO comparedPatentVO = new ComparedPatentVO();
                     BeanUtils.copyProperties(item, comparedPatentVO);
+                    if(comparedPatentVO.getGrantNo()==null){
+                        comparedPatentVO.setGrantNo(item.getPublicNo());
+                        comparedPatentVO.setGrantDate(item.getPublicDate());
+                    }
                     Map<String, Object> map = maps.stream().filter(i -> i.get("id").toString().equals(item.getInpadocFamilyId())).findFirst().orElse(null);
                     if (map != null) {
                         comparedPatentVO.setInpadocFamilyNos((List<String>) map.get("nos"));

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

@@ -361,10 +361,8 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         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);
+            ProjectTask assoTask = this.getById(assoTaskId);
             if (assoTask != null) {
                 //装载最初任务详情
                 BeanUtils.copyProperties(assoTask, projectTaskVO);

src/main/java/cn/cslg/pas/service/importPatent/ImportSinglePatentService.java

@@ -602,9 +602,9 @@ public class ImportSinglePatentService {
             }
             List<String> fullTexts = new ArrayList<>();
             Integer count = 1;
+            List<String> ts = this.getTitleStrs();
             for (Element item : elements) {
                 String fullText = item.getText().replaceAll("<br/>", "");
-                List<String> ts = this.getTitleStrs();
                 if (!ts.contains(fullText.trim())) {
                     String formattedNum = String.format("%04d", count);
                     fullText = "[" + formattedNum + "]" + fullText;