Merge remote-tracking branch 'origin/master'

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/business/TortCompareRecordService.java

@@ -140,7 +140,7 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
         }
         List<TortDTO> tortDTOS = tortCompareRecordDTO.getTortDTOS();
         //不能将特征一次性全部删除，使用处理特征方法
-        if (!tortDTOS.isEmpty()) {
+        if (tortDTOS.isEmpty()) {
             throw new XiaoShiException("传入特征集合不能为空");
         }
         //查询出原来的特征id集合

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

@@ -777,10 +777,10 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         List<String> valuesIds = new ArrayList<>();
         for (String value : values) {
             String[] valueQs = value.split("\\\\");
-            TreeNode parentTreeNode = null;
+            TreeNode treeNode = null;
             for (int i = 0; i < valueQs.length; i++) {
                 String valueQ = valueQs[i];
-                TreeNode treeNode = this.getTreeNodeByName(valueQ, i, fieldId, parentTreeNode);
+                treeNode = this.getTreeNodeByName(valueQ, i, fieldId, treeNode);
                 if (i == valueQs.length - 1) {
                     if (!valuesIds.contains(treeNode.getId())) {
                         valuesIds.add(treeNode.getId().toString());
@@ -795,7 +795,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     public TreeNode getTreeNodeByName(String value, Integer level, Integer fieldId, TreeNode parentTreeNode) {
         Integer parentId = 0;
         if (parentTreeNode != null) {
-            parentId = parentTreeNode.getParentId();
+            parentId = parentTreeNode.getId();
         }
 
         //根据名称查询

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

@@ -116,7 +116,32 @@ public class GetPatentFromExcelThread extends Thread {
     public void loadPatent(UploadParamsVO uploadParamsVO) {
         Patent patent = uploadParamsVO.getPatent();
         String patentNo = patent.getPatentNo();
-        String contry = patentNo.substring(0, 2);
+        String appNo =patent.getAppNo();
+        String publicNo =patent.getPublicNo();
+        String grantNo =patent.getGrantNo();
+        String usedNo =null;
+        if(appNo!=null){
+            usedNo =appNo;
+        }
+        else if(publicNo!=null){
+            usedNo=publicNo;
+        }
+        else if(grantNo!=null){
+            usedNo=grantNo;
+        }
+        String contry = usedNo.substring(0, 2);
+        if(contry.equals("CN")){
+            patentNo=appNo;
+        }
+        else {
+            if(publicNo!=null){
+                patentNo=publicNo;
+            }
+            else if(grantNo!=null){
+                patentNo=grantNo;
+            }
+        }
+        patent.setPatentNo(patentNo);
         //装载标题
         if (uploadParamsVO.getTitle() != null) {
             List<Text> texts = new ArrayList<>();

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;

src/main/resources/mapper/FTOCompareRecordMapper.xml

@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.FTOCompareRecordMapper">
+
     <select id="getComparedPatents" resultType="java.lang.String">
         select distinct compare_file_number
         from fto_compare_record
-        where project_id = ${projectId}
-<if test="compareResult!=null">
-    and compare_result=${compareResult}
-</if>
-    </select>
-
-
-    <select id="getSynergyTaskId" resultType="java.lang.String">
-        select distinct project_task_id
-        from fto_compare_record
-        where asso_task_id = ${taskId}
-       and
+        where project_id = #{projectId}
+        <if test="compareResult!=null">
+            and compare_result = #{compareResult};
+        </if>
     </select>
 
 </mapper>