导出报告

src/main/java/cn/cslg/pas/common/dto/ComparedPatentDTO.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.common.dto;
+
+import cn.cslg.pas.domain.es.PatentPerson;
+import cn.cslg.pas.domain.es.Priorities;
+import cn.cslg.pas.domain.es.Text;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ComparedPatentDTO {
+    private Integer projectId;
+
+    private Integer compareResult;
+    /**
+     * 当前页
+     */
+    private Long current;
+    /**
+     * 每页条数
+     */
+    private Long size;
+}

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

@@ -1,6 +1,7 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.ComparedPatentDTO;
 import cn.cslg.pas.common.dto.ComparedPatentVO;
 import cn.cslg.pas.common.dto.business.GetFeatureSplitDTO;
 import cn.cslg.pas.common.dto.business.ProductMessageDTO;
@@ -122,9 +123,9 @@ public class FTOController {
     }
 
     @Operation(summary = "获得对比过的专利")
-    @GetMapping("/getComparedPatent")
-    public Response getComparedPatent(Integer projectId,Integer compareResult) {
-        List<ComparedPatentVO> comparedPatentVOS = ftoCompareRecordService.getComparedPatent(projectId,compareResult);
+    @PostMapping("/getComparedPatent")
+    public Response getComparedPatent(@RequestBody ComparedPatentDTO comparedPatentDTO) {
+        List<ComparedPatentVO> comparedPatentVOS = ftoCompareRecordService.getComparedPatent(comparedPatentDTO);
         Records records = new Records();
         records.setData(comparedPatentVOS);
         return Response.success(records);

src/main/java/cn/cslg/pas/domain/ReportDocument.java

@@ -0,0 +1,62 @@
+package cn.cslg.pas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 报告文件导出表
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "report_document")
+public class ReportDocument extends BaseEntity<ReportDocument> {
+
+    /**
+     * 报告ID
+     */
+    @Schema(description = "报告ID")
+    @TableField(value = "project_id")
+    private Integer projectId;
+
+    /**
+     * 文件名称
+     */
+    @Schema(description = "文件名称")
+    @TableField(value = "file_name")
+    private String fileName;
+
+    /**
+     * 导出人
+     */
+    @Schema(description = "导出人Id")
+    @TableField(value = "create_id")
+    private String createId;
+
+
+    /**
+     * 模板名称
+     */
+    @Schema(description = "模板名称")
+    @TableField(value = "template_name")
+    private String templateName;
+
+    /**
+     * 模板
+     */
+    @Schema(description = "模板")
+    @TableField(value = "template_id")
+    private Integer templateId;
+
+    @Schema(description = "文件路径")
+    @TableField(value = "file_guid")
+    private String fileGuid;
+
+    @Schema(description = "导出时间")
+    @TableField(value = "create_time")
+    private String createTime;
+}

src/main/java/cn/cslg/pas/domain/es/LegalEvent.java

@@ -47,5 +47,12 @@ public class LegalEvent {
      */
     @JsonProperty("app_no")
     private String appNo;
+    /**
+     * 公开号
+     */
+    @JsonProperty("public_no")
+    private String publicNo;
+    @JsonProperty("grant_no")
+    private String grantNo;
 
 }

src/main/java/cn/cslg/pas/mapper/ReportDocumentMapper.java

@@ -0,0 +1,16 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.ReportDocument;
+import cn.cslg.pas.domain.business.AssoEventFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 报告导出记录
+ *
+ * @author lrj
+ * @date 2023/12/20
+ */
+@Repository
+public interface ReportDocumentMapper extends BaseMapper<ReportDocument> {
+}

src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -6,20 +6,21 @@ import cn.cslg.pas.common.dto.PatentDetailDTO;
 import cn.cslg.pas.common.dto.es.EsCustomFieldDTO;
 import cn.cslg.pas.common.dto.es.EsCustomFieldValueDTO;
 import cn.cslg.pas.common.model.SystemMO;
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.request.StringRequest;
-import cn.cslg.pas.common.utils.DateUtils;
-import cn.cslg.pas.common.utils.FileUtils;
-import cn.cslg.pas.common.utils.FormatUtil;
-import cn.cslg.pas.common.utils.PatentRightUtils;
+import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.vo.*;
 import cn.cslg.pas.common.vo.business.AllCustomFieldVO;
 import cn.cslg.pas.common.vo.business.PatentNoVO;
+import cn.cslg.pas.domain.ReportDocument;
 import cn.cslg.pas.domain.business.*;
 import cn.cslg.pas.domain.es.Text;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.AvoidDesignMapper;
 import cn.cslg.pas.service.business.*;
+import cn.cslg.pas.service.business.es.EsFamilyService;
 import cn.cslg.pas.service.business.es.EsPatentService;
+import cn.cslg.pas.service.business.es.EsQuotePatentService;
 import cn.cslg.pas.service.business.es.EsService;
 import cn.cslg.pas.service.common.FileManagerService;
 import cn.hutool.core.util.IdUtil;
@@ -71,6 +72,17 @@ public class ReportExportService {
     @Autowired
     private FTOCompareRecordService ftoCompareRecordService;
 
+    @Autowired
+    private EsQuotePatentService esQuotePatentService;
+
+    @Autowired
+    private EsFamilyService esFamilyService;
+
+    @Autowired
+    private LoginUtils loginUtils;
+    @Autowired
+    private CacheUtils cacheUtils;
+
     /**
      * @param projectId
      * @param templeId
@@ -100,7 +112,7 @@ public class ReportExportService {
         if (report.getReportType() == 0 || report.getReportType() == 2) {
 //           template = this.getstabilityTemplate(report, filePath);
         } else if (report.getReportType() == 3) {
-//            template = this.FTOtemplate(reportId, filePath, templeId);
+            template = this.FTOTemplate(projectId, templateFilePath, templeId);
         } else if (report.getReportType() == 4) {
 //         template = this.Torttemplate(reportId, filePath, templeId);
         } else if (report.getReportType() == 5) {
@@ -111,25 +123,30 @@ public class ReportExportService {
         // 读取模板、数据并渲染
 //         文件是否已存在，则删除
         File file = new File(outPath);
-        if (file.exists()) {
-            file.delete();
-        }
+
 //      生成word保存在指定目录
         template.writeToFile(outPath);
         template.close();
         //导出成功后，导出报告记录入库
-//        String url = fileUtils.getDirectory2(directoryName) + fileName;
+
+        List<String> ids = fileManagerService.uploadFileGetGuid2(Arrays.asList(file));
+        if (ids == null || ids.size() == 0) {
+            throw new XiaoShiException("保存记录失败");
+        }
 //        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-//        ReportDocument reportDocument = new ReportDocument();
-//        reportDocument.setReportId(reportId);
-//        reportDocument.setFileName(fileName);
-//        reportDocument.setFilePath(url);
-//        reportDocument.setPersonId(personnelVO.getId());
-//        reportDocument.setTemplateId(reportTemplate.getId());
-//        reportDocument.setTemplateName(reportTemplate.getTemplateName());
-//        reportDocument.setPersonName(personnelVO.getName());
-//        reportDocument.insert();
-//        return Response.success(url);
+        PersonnelVO personnelVO =new PersonnelVO();
+        personnelVO.setId("1");
+        ReportDocument reportDocument = new ReportDocument();
+        reportDocument.setProjectId(projectId);
+        reportDocument.setFileName(fileName);
+        reportDocument.setFileGuid(ids.get(0));
+        reportDocument.setCreateId(personnelVO.getId());
+        reportDocument.setTemplateId(reportTemplate.getId());
+        reportDocument.setTemplateName(reportTemplate.getTemplateName());
+        reportDocument.insert();
+        if (file.exists()) {
+            file.delete();
+        }
         return "";
     }
 
@@ -390,24 +407,12 @@ public class ReportExportService {
                 //存放失效专利信息
                 List<Map<String, Object>> lapsePatents = new ArrayList<>();
                 for (PatentColumnDTO patent : patentColumnDTOS) {
-//                    List<JSONObject> applicantJSONs = JSON.parseArray(patent.get("applicant").toString(), JSONObject.class);
-//                    StringBuilder applicants = new StringBuilder();
-//                    StringBuilder rightPerson = new StringBuilder();
-//                    applicantJSONs.forEach(tem -> {
-//                        if (Integer.parseInt(tem.get("dataType").toString()) == 1) {
-//                            applicants.append(tem.get("name") + "\r");
-//                        } else {
-//                            rightPerson.append(tem.get("name") + "\r");
-//                        }
-//                    });
-//                    //装载同族信息
-////                    JSONObject familys = JSONObject.parseObject(patent.get("family").toString());
-//                    List<String> patSnaps = JSON.parseArray(familys.get("patSnap").toString(), String.class);
-//                    List<String> simples = JSON.parseArray(familys.get("simple").toString(), String.class);
-//                    List<String> inpadocs = JSON.parseArray(familys.get("inpadoc").toString(), String.class);
-//                    patSnaps.addAll(simples);
-//                    patSnaps.addAll(inpadocs);
-//                    String familyStr = StringUtils.join(patSnaps, ",");
+                    String applicants = "";
+                    StringBuilder rightPerson = new StringBuilder();
+                    if (patent.getApplicant() != null && patent.getApplicant().size() != 0) {
+                        applicants = StringUtils.join(patent.getApplicant(), "\r");
+                    }
+
 //                    //装载法律状态
 //                    StringBuilder affair = new StringBuilder();
 //                    List<JSONObject> affaires = JSON.parseArray(patent.get("affair").toString(), JSONObject.class);
@@ -418,11 +423,37 @@ public class ReportExportService {
 //                    );
                     //装载单个专利的信息
                     Map<String, Object> patentMap = new HashMap<>();
+
                     //同族专利
-//                    patentMap.put("simpleFamilys", familyStr);
+                    try {
+                        //装载同族信息
+                        List<Map<String, Object>> familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "inpadoc");
+                        if (familyMaps != null && familyMaps.size() > 0) {
+                            Map<String, Object> familyMap = familyMaps.get(0);
+                            if (familyMap.get("nos") != null) {
+                                List<String> nos = (List<String>) familyMap.get("nos");
+                                if (nos != null && nos.size() > 0) {
+                                    String nosStr = StringUtils.join(nos, "\r");
+                                    patentMap.put("simpleFamilys", nosStr);
+                                }
+                            }
+                        }
+                    } catch (Exception e) {
+                    }
                     //引用专利
+                    try {
+                        Map<String, Object> map = esQuotePatentService.getEsQutePatentByNos(patent.getPatentNo());
+                        if (map.get("nos") != null) {
+                            List<String> nos = (List<String>) map.get("nos");
+                            if (nos != null && nos.size() > 0) {
+                                String nosStr = StringUtils.join(nos, "\r");
+                                patentMap.put("quotePatents", nosStr);
+                            }
+                        }
 
-//                    patentMap.put("quotePatents", patent.get("quote"));
+                    } catch (Exception e) {
+
+                    }
                     //申请日
                     patentMap.put("applicationDate", patent.getAppDate());
                     //公开日
@@ -430,13 +461,21 @@ public class ReportExportService {
                     //专利号
                     patentMap.put("publicNo", patent.getPatentNo());
                     patentMap.put("firstPublicDate", patent.getPublicDate());
-//                    patentMap.put("applicant", applicants);
-//                    patentMap.put("rightPerson", rightPerson);
+                    patentMap.put("applicant", applicants);
+                    patentMap.put("rightPerson", rightPerson);
 //                    patentMap.put("affair", affair);
+
                     //优先权日
-                    patentMap.put("priorityDate", patent.getPriorities());
+                    if (patent.getPriorities() != null && patent.getPriorities().size() != 0) {
+                        patentMap.put("priorityDate", patent.getPriorities().get(0).getPriorityDate());
+                    }
+
                     //图示
-//                    patentMap.put("abstractPath", "http://139.224.24.90:8081" + patent.get("abstractPath"));
+                    String guid = FormatUtil.getPictureFormat(patent.getAppNo());
+                    PictureRenderData pictureData = this.guidToStream(guid);
+                    if (pictureData != null) {
+                        patentMap.put("abstractPath", pictureData);
+                    }
                     //获得专利对比记录的信息
                     Map<String, Object> temMap = ftoCompareRecordService.LoadCompareMessageForExport(projectId, patent.getPatentNo());
                     List<CompareMessageVO> compareMessageVOS = (List<CompareMessageVO>) temMap.get("compareMessageVOs");

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

@@ -128,7 +128,7 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
 
         if (patentNos.size() > 0) {
             try {
-                patentList = esPatentService.getPatentsByNo(patentNos,false);
+                patentList = esPatentService.getPatentsByNo(patentNos,false,null,null);
             } catch (Exception e) {
                 throw new XiaoShiException("装载文献信息失败");
             }

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

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service.business;
 
+import cn.cslg.pas.common.dto.ComparedPatentDTO;
 import cn.cslg.pas.common.dto.ComparedPatentVO;
 import cn.cslg.pas.common.dto.business.GetFeatureSplitDTO;
 import cn.cslg.pas.common.dto.business.TortCompareRecordDTO;
@@ -848,11 +849,15 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
     /**
      * 获得已经对比过的专利
      *
-     * @param projectId
-     * @param compareResult
+     * @param 
+     * @param
      * @return
      */
-    public List<ComparedPatentVO> getComparedPatent(Integer projectId, Integer compareResult) {
+    public List<ComparedPatentVO> getComparedPatent(ComparedPatentDTO comparedPatentDTO) {
+        Integer projectId = comparedPatentDTO.getProjectId();
+        Integer compareResult = comparedPatentDTO.getCompareResult();
+        Long current = comparedPatentDTO.getCurrent();
+        Long size = comparedPatentDTO.getSize();
         //根据projectId 查询出对比过的专利号
         List<String> patentNos = this.getBaseMapper().getComparedPatents(projectId, compareResult);
         List<ComparedPatentVO> comparedPatentVOS = new ArrayList<>();
@@ -862,7 +867,7 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
             if (patentNos != null && patentNos.size() != 0) {
                 //查询专利状态字典
                 List<SystemDict> systemDicts = systemDictService.getSystemDictListByType(Arrays.asList("PATENT_SIMPLE_STATUS"));
-                patents = esPatentService.getPatentsByNo(patentNos, true);
+                patents = esPatentService.getPatentsByNo(patentNos, true, current, size);
                 List<Map<String, Object>> maps = esFamilyService.getPatentFamilyByNos(patentNos, "inpadoc");
                 patents.forEach(item -> {
                     ComparedPatentVO comparedPatentVO = new ComparedPatentVO();

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

@@ -261,7 +261,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
                     if (item.getCreateId() != null) {
                         createIds.add(item.getCreateId());
                     }
-                    if (item.getHandler() != null) {
+                    if (item.getHandler() != null && item.getHandlerType() != null && item.getHandlerType().equals(0)) {
                         handlerIds.add(item.getHandler());
                     }
                     if (item.getProjectId() != null) {
@@ -290,15 +290,23 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         }
         //装载信息
         for (ProjectTaskVO projectTaskVO : projectTaskVOS) {
+            Integer handlerType = projectTaskVO.getHandlerType();
             //装载人员信息
             Personnel personnel = personnels.stream().filter(item -> item.getId().equals(projectTaskVO.getCreateId())).findFirst().orElse(null);
-            Personnel personnel2 = personnels2.stream().filter(item -> item.getId().equals(projectTaskVO.getHandler())).findFirst().orElse(null);
             if (personnel != null) {
                 projectTaskVO.setCreateName(personnel.getPersonnelName());
-                projectTaskVO.setHandlerName(personnel2.getPersonnelName());
+            }
+
+            if (handlerType != null && handlerType.equals(0)) {
+                Personnel personnel2 = personnels2.stream().filter(item -> item.getId().equals(projectTaskVO.getHandler())).findFirst().orElse(null);
+                if (personnel2 != null) {
+                    projectTaskVO.setHandlerName(personnel2.getPersonnelName());
+                }
             } else {
-                throw new XiaoShiException("未获取到当前登陆人信息");
+                projectTaskVO.setHandlerName(projectTaskVO.getHandler());
             }
+
+
             String name = patentDigProjectFilesService.getProcessName(projectTaskVO.getProcessId());
             projectTaskVO.setProcessName(name);
             Project project = projects.stream().filter(item -> item.getId().equals(projectTaskVO.getProjectId())).findFirst().orElse(null);
@@ -598,7 +606,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         ProjectTask projectTask = this.getOne(queryWrapper, false);
         if (projectTask != null) {
             //查询出当前任务的类型
-            //如果是分配任务
+            //如果是分配任务/或者协同任务
             if (projectTask.getType() == 6) {
                 //类型为0，需要完成任务
                 if (type == 0) {
@@ -693,6 +701,25 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
                     }
                 }
             }
+            //处理协同任务完成
+            else if (projectTask.getType() == 4) {
+                //获得请求人
+                PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+                if (type == 0) {
+                    //判断请求人是否为创建人
+                    if (personnelVO.getId() != null && personnelVO.getId().equals(projectTask.getCreateId())) {
+                        projectTask.setStatus(3);
+                        projectTask.updateById();
+                    } else {
+                        projectTask.setStatus(6);
+                        projectTask.updateById();
+                    }
+                } else if (type == 1) {
+                    projectTask.setStatus(5);
+                    projectTask.updateById();
+                }
+
+            }
         } else {
             throw new XiaoShiException("该任务不存在");
         }
@@ -826,6 +853,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
 
     /**
      * 根据任务id查询专利号
+     *
      * @param taskId
      * @return
      */

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -211,7 +211,7 @@ public class EsPatentService {
      * @return
      * @throws Exception
      */
-    public List<Patent> getPatentsByNo(List<String> patentNos,Boolean ifGetAll) throws Exception {
+    public List<Patent> getPatentsByNo(List<String> patentNos,Boolean ifGetAll,Long current,Long size) throws Exception {
         List<Patent> patentList = new ArrayList<>();
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
@@ -234,6 +234,9 @@ public class EsPatentService {
                     .filter(fieldSourceBuilder -> fieldSourceBuilder
                             .includes(reSources)));
         }
+        if (current > 0 && size > 0&&current!=null&&size!=null) {
+            builder.from((current.intValue() - 1) * size.intValue()).size(size.intValue());
+        }
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         if (hits != null && hits.size() > 0) {

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

@@ -799,7 +799,9 @@ public class EsService {
             builder.index("legal_event");
             //申请号
             Query q1 = QueryBuilders.term(t -> t.field("app_no").value(starPatentVO.getApplicationNo()));
-            Query bool = QueryBuilders.bool(i -> i.must(q1));
+            Query q2 =QueryBuilders.term((t->t.field("grant_no").value(starPatentVO.getPublicAccreditNo())));
+            Query q3 =QueryBuilders.term((t->t.field("public_no").value(starPatentVO.getPublicNo())));
+            Query bool = QueryBuilders.bool(i -> i.should(q1,q2,q3));
             builder.query(bool);
             SearchResponse<LegalEvent> response = null;
             try {
@@ -823,6 +825,8 @@ public class EsService {
                         legalEvent1.setEventDate(item.getLegalDate());
                         legalEvent1.setCode(item.getLegalCode());
                         legalEvent1.setAppNo(starPatentVO.getApplicationNo());
+                        legalEvent1.setGrantNo(starPatentVO.getPublicAccreditNo());
+                        legalEvent1.setPublicNo(starPatentVO.getPublicNo());
                         legalEvent1.setDescription(item.getLegalStatusInfo());
                         legalEvent1.setName(item.getLegalStatus());
                         try {

src/main/java/cn/cslg/pas/service/common/FileManagerService.java

@@ -175,6 +175,41 @@ public class FileManagerService {
     /**
      * 调用文件系统上传文件接口
      *
-     * @param files 文件
+
      */
+    public String uploadFile2(List<File> files) throws IOException {
+
+        MultipartBody.Builder multipartBodyBuilder = new MultipartBody.Builder()
+                .setType(MultipartBody.FORM);
+        for (File file : files) {
+            //根据文件名获取文件的MIME类型
+            String mimeType = getMimeType(file.getPath());
+            multipartBodyBuilder.addFormDataPart("files", file.getName(), RequestBody.create(MediaType.parse(mimeType), file));
+        }
+        RequestBody requestBody = multipartBodyBuilder
+                .addFormDataPart("sourceId", String.valueOf(FileSource))
+                .build();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url(FMSUrl + "/fileManager/uploadNormalFile")
+                .post(requestBody)
+                .build();
+        Response response = null;
+        response = okHttpClient.newCall(request).execute();
+        // 最后记得删除临时文件
+        for (File file : files) {
+            FileUtils.deleteQuietly(file);
+        }
+        return Objects.requireNonNull(response.body()).string();
+    }
+    public List<String> uploadFileGetGuid2(List<File> files) throws IOException {
+        String res= this.uploadFile2(files);
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        List<String> guids = JSONArray.parseArray(jsonObject.get("data").toString(), String.class);
+        return guids;
+    }
 }

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

@@ -114,7 +114,7 @@ public class GetCataloguingFromWebThread extends Thread {
                 }
 //
 //                //添加法律事务
-//                esService.addEsLegalEvent(uploadPatentWebDTO.getStarPatentVO().getPublicNo());
+                esService.addEsLegalEvent(uploadPatentWebDTO.getStarPatentVO().getPublicNo());
 //
 //                //添加引用专利
                 String nos = starPatentVO.getQuoteNos();

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

@@ -39,7 +39,7 @@ public class EsPatentServiceTests {
         List<String> patentNos =new ArrayList<>();
         patentNos.add("CN201910069334.7");
         patentNos.add("CN201110286649.0");
-        esPatentService.getPatentsByNo(patentNos,true);
+        esPatentService.getPatentsByNo(patentNos,true,null,null);
     }
     @Test
     public  void getFamilys() throws Exception{

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

@@ -33,7 +33,7 @@ public class FTOCompareRecordServiceTests {
 
     @Test
     public void getComparedPatent() throws Exception {
-        List<ComparedPatentVO> comparedPatentVOS =ftoCompareRecordService.getComparedPatent(101,3);
-        System.out.println(comparedPatentVOS);
+//        List<ComparedPatentVO> comparedPatentVOS =ftoCompareRecordService.getComparedPatent(101,3);
+//        System.out.println(comparedPatentVOS);
     }
 }