fixed

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

@@ -189,6 +189,22 @@ public class PatentStarApiService {
         return null;
     }
 
+    public String getFormatCondition(String condition) {
+        String s = condition.substring(condition.indexOf("=") + 1);
+        String s1 = s.replaceAll("[()]", "");
+        String[] valueStrs = s1.split("[，,]|(\\r\\n)+|\\r+|\\n+");
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < valueStrs.length; i++) {
+            final String value = valueStrs[i];
+            if (i != valueStrs.length - 1) {
+                stringBuilder.append(value).append(",");
+            } else {
+                stringBuilder.append(value);
+            }
+        }
+        return stringBuilder.toString();
+    }
+
     public List<PatentStarListDTO> getSplitedConditions(PatentStarListDTO patentStarListDTO, int patentNum) throws IOException {
         DateTime nowDate = new DateTime();
         DateTime date = DateUtils2.formStrToDateTime("1900-01-01");
@@ -855,6 +871,10 @@ public class PatentStarApiService {
             if (item.getLG() != null) {
                 patentColumnDTO.setSimpleStatus(item.getLG().toString());
             }
+            //装载专利类型
+            if (item.getPatentType() != null) {
+                patentColumnDTO.setPatentType(item.getPatentType().toString());
+            }
             //装载摘要
             List<Text> abstractList = new ArrayList<>();
             Text text = new Text();
@@ -944,24 +964,32 @@ public class PatentStarApiService {
             if (item.getApplicantStr() != null && !item.getApplicantStr().trim().equals("")) {
                 List<String> names = Arrays.asList(item.getApplicantStr().split(";"));
                 patentColumnDTO.setApplicant(names);
+            } else {
+                patentColumnDTO.setApplicant(new ArrayList<>());
             }
 
             //装载发明人
             if (item.getInventorStr() != null && !item.getInventorStr().trim().equals("")) {
                 List<String> names = Arrays.asList(item.getInventorStr().split(";"));
                 patentColumnDTO.setInventor(names);
+            } else {
+                patentColumnDTO.setInventor(new ArrayList<>());
             }
 
             //装载权利人
             if (item.getCurrentApplicantStr() != null && !item.getCurrentApplicantStr().trim().equals("")) {
                 List<String> names = Arrays.asList(item.getCurrentApplicantStr().split(";"));
                 patentColumnDTO.setRightHolder(names);
+            } else {
+                patentColumnDTO.setRightHolder(new ArrayList<>());
             }
 
             //装载代理人
             if (item.getAgentStr() != null && !item.getAgentStr().trim().equals("")) {
                 List<String> names = Arrays.asList(item.getAgentStr().split(";"));
                 patentColumnDTO.setAgent(names);
+            } else {
+                patentColumnDTO.setAgent(new ArrayList<>());
             }
 
             //装载代理机构

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

@@ -620,4 +620,60 @@ public class EventServiceTests {
         }
     }
 
+    @Test
+    public void test108() {
+        int size = 4;
+        int num = 2;
+        String s = "CN202311743859.7,CN202311695772.7,CN202311695122.2,CN202380013186.1，CN202321985312.3,CN202321795870.3,CN202321466063.7,CN202321458147.6,CN202321047372.0,CN202321021503.8";
+        String[] valueStrs = s.split("[，,]|(\\r\\n)+|\\r+|\\n+");
+        StringBuilder builder = new StringBuilder();
+        builder.append("NO").append("=").append("(");
+        for (int i = (num-1)*size; i < (num*size); i++) {
+            final String valueStr = valueStrs[i];
+            System.out.println(valueStr);
+            if (i != valueStrs.length - 1) {
+                builder.append(valueStr).append(",");
+            } else {
+                builder.append(valueStr);
+            }
+        }
+        final String s2 = builder.append(")").toString();
+        System.out.println(s2);
+        System.out.println("---------------------");
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < valueStrs.length; i++) {
+            final String value = valueStrs[i];
+            if (i != valueStrs.length - 1) {
+                stringBuilder.append(value).append("|");
+            } else {
+                stringBuilder.append(value);
+            }
+        }
+        final String s1 = stringBuilder.toString();
+        System.out.println(s1);
+    }
+
+    @Test
+    public void test109() {
+//        String s = condition.substring(condition.indexOf("=") + 1);
+//        String s1 = s.replaceAll("[()]", "");
+
+        int size = 4;
+        int num = 2;
+        String s = "CN202311743859.7,CN202311695772.7,CN202311695122.2,CN202380013186.1，CN202321985312.3,CN202321795870.3,CN202321466063.7,CN202321458147.6,CN202321047372.0,CN202321021503.8";
+        String[] valueStrs = s.split("[，,]|(\\r\\n)+|\\r+|\\n+");
+        StringBuilder builder = new StringBuilder();
+        builder.append("NO").append("=").append("(");
+        for (int i = (num-1)*size; i < (num*size); i++) {
+            final String valueStr = valueStrs[i];
+            System.out.println(valueStr);
+            if (i != valueStrs.length - 1) {
+                builder.append(valueStr).append(",");
+            } else {
+                builder.append(valueStr);
+            }
+        }
+        final String s2 = builder.append(")").toString();
+        System.out.println(s2);
+    }
 }