1.10 lrj

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -60,7 +60,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             String str = patentRights.get(i).getContent();
             str = str.replace(" ", "");
             str = str.replace("\r","");
-            Pattern p = Pattern.compile("^[0-9]+\\..*");
+            Pattern p = Pattern.compile("^[0-9]+(\\.||'、').*");
             Matcher m = p.matcher(str);
             if (m.matches()) {
                 retList.add(patentRights.get(i));
@@ -222,9 +222,8 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
             //特征序号
             Integer order = 1;
             List<Features> featuresList = new ArrayList<>();
-            String[] tems = patentRights.get(i).getContent().split("\\.");
-            String name = "权要" + tems[0].replace(" ", "");
-            int rightId = patentRights.get(i).getSort();
+            String name = "权要" + patentRights.get(i).getSort();
+            int rightId = patentRights.get(i).getSort()+1;
             //对需要拆解的权要进行拆解
             if (featureFromDb != null && featureFromDb.size() != 0) {
                 featuresList = featureFromDb.stream().filter(item -> item.getRightId().equals(rightId) && item.getSplitBy().equals(a) && item.getPartnerId().equals(personnelVO.getId()) && item.getSplitType().equals(b)).collect(Collectors.toList());

RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -30,6 +30,7 @@ import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.formula.functions.T;
 import org.ddr.poi.html.HtmlRenderPolicy;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -61,7 +62,8 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
     private final TemplateConfigService templateConfigService;
     private final ReportFieldPatentLinkService reportFieldPatentLinkService;
     private final CompareMessageService compareMessageService;
-
+    @Value("${fileURL}")
+    private  String fileURL;
     public String reportDocument(ReportDocument reportDocument) {
 
         return Response.success();
@@ -236,7 +238,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
             patentListMap.put("abstractStr", item.get("abstractStr"));
             patentListMap.put("compareFileName", "对比文件" + (i + 1));
             patentListMap.put("applicationDate", item.get("applicationDate"));
-            patentListMap.put("abstractPath", "http://139.224.24.90:8081" + item.get("abstractPath"));
+            patentListMap.put("abstractPath", fileURL + item.get("abstractPath"));
             patentListMap.put("disclosures", disclosures);
             patentListMaps.add(patentListMap);
             //给出现的专利添加别名

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -734,7 +734,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         queryCMVO.setCompareResult(syneryVO.getCompareResult());
         List<String> AllpatentNos = compareMessageService.getBaseMapper().getComparedMessageAll(queryCMVO);
         //无查询条件
-        if (patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) {
+        if ((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0)&&syneryVO.getPatentNo()!=null) {
             patentVO.setPatentNos(AllpatentNos);
         }
         //有查询条件时，自定义字段的专利号和任务的专利号取交集

RMS/src/main/resources/application-dev.yml

@@ -30,4 +30,5 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mail.queue
+queueName: mail.queue
+fileURL:  http://139.224.24.90:8082

RMS/src/main/resources/application-test.yml

@@ -30,4 +30,5 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mailTest.queue
+queueName: mailTest.queue
+fileURL:  http://139.224.24.90:8082

RMS/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: test
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization:

RMS/src/main/resources/mapper/CompareMessageMapper.xml

@@ -23,7 +23,6 @@
         select DISTINCT f.SIGN_PATENT_NO from RMS_TEST.FEATURES f left join RMS_TEST.COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
         <where>
             and f.REPORT_ID=#{params.reportId}
-            and cm.ID is not null
             <if test="params.patentNo !=null">
                 and f.SIGN_PATENT_NO=#{params.patentNo}
             </if>

RMS/target/classes/application-dev.yml

@@ -30,4 +30,5 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mail.queue
+queueName: mail.queue
+fileURL:  http://139.224.24.90:8082

RMS/target/classes/application-test.yml

@@ -30,4 +30,5 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mailTest.queue
+queueName: mailTest.queue
+fileURL:  http://139.224.24.90:8082

RMS/target/classes/mapper/CompareMessageMapper.xml

@@ -23,10 +23,11 @@
         select DISTINCT f.SIGN_PATENT_NO from RMS_TEST.FEATURES f left join RMS_TEST.COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
         <where>
             and f.REPORT_ID=#{params.reportId}
-            and cm.ID is not null
+            <if test="params.patentNo !=null">
+                and f.SIGN_PATENT_NO=#{params.patentNo}
+            </if>
             <if test="params.compareResult !=null">
                 and   cm.COMPARE_RESULT=#{params.compareResult}
-
             </if>
         </where>