zero 1 년 전
부모
커밋
4df07541b2
1개의 변경된 파일20개의 추가작업 그리고 10개의 파일을 삭제
  1. 20 10
      src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

+ 20 - 10
src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -1008,19 +1008,29 @@ public class PatentStarApiService {
         QueryExternalFamilyDTO familyDTO = JSONObject.parseObject(family, QueryExternalFamilyDTO.class);
         String familyInfos = familyDTO.getFamilyinfo();
         List<String> publicNos = Arrays.asList(familyInfos.split(";"));
+        String pubNo = "";
         if (!CollectionUtils.isEmpty(publicNos)) {
-            for (String publicNo : publicNos) {
-                PatentStarListDTO patentStarListDTO = new PatentStarListDTO();
-                String condition = "PN=" + publicNo;
-                patentStarListDTO.setCurrentQuery(condition);
-                patentStarListDTO.setDBType("CN");
-                patentStarListDTO.setOrderBy("AD");
-                patentStarListDTO.setOrderByType("DESC");
-                patentStarListDTO.setPageNum(vo.getPageNum());
-                patentStarListDTO.setRowCount(vo.getPageSize());
-                records = this.patentStarSearchLocal(patentStarListDTO);
+            int count = publicNos.size() - 1;
+            for (int i = 0; i < publicNos.size(); i++) {
+                String s = publicNos.get(i);
+                if (i == count) {
+                    pubNo = pubNo + s;
+                } else {
+                    pubNo = pubNo + s + " " + "OR" + " ";
+                }
             }
         }
+        if (StringUtils.isNotEmpty(pubNo)) {
+            PatentStarListDTO patentStarListDTO = new PatentStarListDTO();
+            String condition = "PN="  + "(" + pubNo + ")";
+            patentStarListDTO.setCurrentQuery(condition);
+            patentStarListDTO.setDBType("CN");
+            patentStarListDTO.setOrderBy("AD");
+            patentStarListDTO.setOrderByType("DESC");
+            patentStarListDTO.setPageNum(vo.getPageNum());
+            patentStarListDTO.setRowCount(vo.getPageSize());
+            records = this.patentStarSearchLocal(patentStarListDTO);
+        }
         return records;
     }