2022-8-25 报告处理

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/PatentMO.java

@@ -37,9 +37,6 @@ public class PatentMO {
     private List<InventorMO> inventor_list;//发明人里列表
 
 
-
-
-
     public List<PermitMO> getPermit_list() {
         return permit_list;
     }
@@ -137,7 +134,6 @@ public class PatentMO {
     }
 
 
-
     public String getApplicant_names_standard() {
         return applicant_names_standard;
     }
@@ -174,6 +170,7 @@ public class PatentMO {
     public List<PatentLawMO> getLawArrys() {
         return lawArrys;
     }
+
     public void setLawArrys(List<PatentLawMO> lawArrys) {
         this.lawArrys = lawArrys;
     }
@@ -203,7 +200,8 @@ public class PatentMO {
     private String manualout;
     private String page;
     private String inventornum;
-    private String num2;
+    private String num2;//权利要求数量
+    private String num3;//独立权利要求数量
     private List<PatentContentMO> content;
     private List<PatentContentMO> contentout;
     private List<ContentMO2> selfcontent;
@@ -233,7 +231,7 @@ public class PatentMO {
     private String firstnventoraddr;
     private String epcountry;
     private String authorizationpdf;
-    private String  Publicpdf;
+    private String Publicpdf;
 
     private String sfamily;
     private String ifamily;
@@ -454,6 +452,14 @@ public class PatentMO {
         this.num2 = num2;
     }
 
+    public String getNum3() {
+        return num3;
+    }
+
+    public void setNum3(String num3) {
+        this.num3 = num3;
+    }
+
     public List<PatentContentMO> getContent() {
         return content;
     }
@@ -687,11 +693,10 @@ public class PatentMO {
         this.abstract_path = abstract_path;
     }
 
-    public static class ContentMO
-    {
+    public static class ContentMO {
         private String title;
         List<String> item;
-
+        List<String> out;
 
         public String getTitle() {
             return title;
@@ -708,15 +713,25 @@ public class PatentMO {
         public void setItem(List<String> item) {
             this.item = item;
         }
+
+        public List<String> getOut() {
+            return out;
+        }
+
+        public void setOut(List<String> out) {
+            this.out = out;
+        }
     }
-    public static class ContentMO2
-    {
+
+    public static class ContentMO2 {
         private String title;
         private String item;
+        private String out;
 
-        public ContentMO2(String title, String item) {
+        public ContentMO2(String title, String item,String out) {
             this.title = title;
             this.item = item;
+            this.out = out;
         }
 
         public String getTitle() {
@@ -734,5 +749,13 @@ public class PatentMO {
         public void setItem(String item) {
             this.item = item;
         }
+
+        public String getOut() {
+            return out;
+        }
+
+        public void setOut(String out) {
+            this.out = out;
+        }
     }
 }

PAS/src/main/java/cn/cslg/pas/service/ReportService.java

@@ -294,13 +294,14 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         patentMO.setPage(FormatUtil.toString(p.getDocPage()));//文献页数
         patentMO.setInventornum(FormatUtil.toString(p.getInventorNum()));//发明人数量
         patentMO.setNum2(FormatUtil.toString(p.getRightNum()));//权利要求数量
+        patentMO.setNum3(FormatUtil.toString(p.getSelfRightContent()));//独立权利要求数量
 //      patentMO.setContent(p.getContent());//TODO:权利要求 暂定
 //      patentMO.setContentout(p.getContentout());////TODO:权利要求(译) 暂定
 
 //        List<PatentMO.ContentMO> cs = formatContent(p.getSelfcontent());
 //        patentMO.setSelfcontent(cs);//独立权利要求
         List<PatentRight> patentRightList = patentRightService.getPatentRightByPatentId(p.getId());
-        List<PatentMO.ContentMO2> cs = formatContent(patentRightList.stream().filter(item -> item.getType().equals(1)).map(PatentRight::getContent).collect(Collectors.toList()));
+        List<PatentMO.ContentMO2> cs = formatContent(patentRightList.stream().filter(item -> item.getType().equals(1)).collect(Collectors.toList()));
         patentMO.setSelfcontent(cs);//独立权利要求
 
         patentMO.setPriorityno(FormatUtil.toString(p.getPriorityNo()));//优先权号
@@ -360,6 +361,10 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                     patentMO.setFirstapplicant(firstApplicant.getName());
                 }
             }
+            if (patentMO.getFirstapplicant() == null) {
+                System.out.println(patentMO.getPatentno());
+                System.out.println("沈永艺");
+            }
             patentMO.setApplicant_list_current(aplist);
             //申请人 标准
             List<String> names2 = alist.stream().map(PatentApplicant::getShortName).collect(Collectors.toList());
@@ -463,7 +468,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
 
 
     //独立权利要求格式化
-    private List<PatentMO.ContentMO2> formatContent(List<String> content) {
+    private List<PatentMO.ContentMO2> formatContent(List<PatentRight> content) {
         if (content == null || content.size() == 0) {
             return new ArrayList<>();
         }
@@ -471,20 +476,33 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         for (int i = 0; i < content.size(); i++) {
             PatentMO.ContentMO m = new PatentMO.ContentMO();
             m.setTitle("独权" + (i + 1));
-            m.setItem(Collections.singletonList(content.get(i)));
+            m.setItem(Collections.singletonList(content.get(i).getContent()));
+            m.setOut(Collections.singletonList(content.get(i).getContentOut()));
             list.add(m);
         }
         List<PatentMO.ContentMO2> rlist = new ArrayList<>();
         if (list.size() > 0) {
             for (PatentMO.ContentMO cm : list) {
                 StringBuilder sb = new StringBuilder("");
+                StringBuilder sbb = new StringBuilder("");
                 for (String s : cm.getItem()) {
                     sb.append(s);
                 }
+                for (String s : cm.getOut()) {
+                    sbb.append(s);
+                }
                 String dcode = sb.toString().replace("\n", "").replace("；", ";");
+                String code;
+                if (dcode.contains("。")) {
+                    code = sbb.toString().replace("\n", "").replace("。", ";");
+                } else {
+                    code = sbb.toString().replace("\n", "").replace("；", ";");
+                }
                 List<String> sarry = Arrays.asList(dcode.split(";"));
-                for (String s : sarry) {
-                    rlist.add(new PatentMO.ContentMO2(cm.getTitle(), s));
+                List<String> out = Arrays.asList(code.split(";"));
+                for (int i = 0, sarrySize = sarry.size(); i < sarrySize; i++) {
+                    String s = sarry.get(i);
+                    rlist.add(new PatentMO.ContentMO2(cm.getTitle(), s, out.get(i)));
                 }
             }
         }