fixed

src/main/java/cn/cslg/pas/common/vo/QueryExternalFamilyVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 public class QueryExternalFamilyVO {
 
     private String patentNo;
+
     private Integer pageNum;
 
     private Integer pageSize;

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

@@ -86,6 +86,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
     @Autowired
     private SystemDictMapper systemDictMapper;
 
+    /**
+     * 专利列表上新增发明人/权利人/申请人合并
+     * @param vo
+     * @return
+     * @throws Exception
+     */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer mergePerson(MergePersonVO vo) throws Exception {
         Integer type = vo.getType();
@@ -305,6 +311,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return map;
     }
 
+    /**
+     * 专利列表上再次新增发明人/权利人/申请人合并
+     * @param vo
+     * @return
+     * @throws Exception
+     */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer mergePersonAgain(MergePersonAgainVO vo) throws Exception {
         List<String> mergedNames = vo.getNeedMergedName();
@@ -343,6 +355,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return this.mergePerson(personVO);
     }
 
+    /**
+     * 专利列表上编辑发明人/权利人/申请人合并
+     * @param vo
+     * @return
+     * @throws Exception
+     */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer updateMergePerson(MergePersonVO vo) throws Exception {
         //获取登陆人信息 用于设置创建人
@@ -448,6 +466,11 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return person.getId();
     }
 
+    /**
+     * 发明人/权利人/申请人合并列表查询
+     * @param vo
+     * @return
+     */
     public Records selectMergePersonList(MergePersonQueryVO vo) {
         List<MergePersonQueryDTO> list = new ArrayList<>();
         IPage<MergePerson> page = new Page<>(vo.getPageNum(), vo.getPageSize());
@@ -481,6 +504,11 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return records;
     }
 
+    /**
+     * 合并人员详情
+     * @param vo
+     * @return
+     */
     public MergePersonQueryDTO selectMergePersonDetail(MergePersonIdVO vo) {
         MergePersonQueryDTO dto = new MergePersonQueryDTO();
         MergePerson person = mergePersonMapper.selectById(vo.getId());
@@ -492,6 +520,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return dto;
     }
 
+    /**
+     * 获取所有发明人/权利人/申请人
+     * @param vo
+     * @return
+     * @throws Exception
+     */
     public Records getMergePerson(GetAllPersonVO vo) throws Exception {
         Integer projectId = vo.getProjectId();
         Long pageNum = vo.getPageNum();
@@ -739,6 +773,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return records;
     }
 
+    /**
+     * 发明人/权利人/申请人合并后的名称移除
+     * @param vo
+     * @return
+     * @throws Exception
+     */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer delMergedName(MergedNameVO vo) throws Exception {
         Integer type = vo.getType();
@@ -948,6 +988,12 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         return mergePerson.getId();
     }
 
+    /**
+     * 发明人/权利人/申请人合并记录删除
+     * @param vo
+     * @return
+     * @throws Exception
+     */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer delMergePerson(MergePersonIdVO vo) throws Exception {
         Integer type = vo.getType();

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

@@ -837,7 +837,9 @@ public class PatentStarApiService {
             //装载公告号
             patentColumnDTO.setGrantNo(item.getPublicAccreditNo());
             //装载专利状态
-            patentColumnDTO.setSimpleStatus(item.getLG().toString());
+            if (item.getLG() != null) {
+                patentColumnDTO.setSimpleStatus(item.getLG().toString());
+            }
             //装载摘要
             List<Text> abstractList = new ArrayList<>();
             Text text = new Text();
@@ -990,9 +992,14 @@ public class PatentStarApiService {
      */
     public PatentColumnDTO queryExternalDetail(QueryExternalFamilyVO vo) throws IOException {
         PatentStarListDTO patentStarListDTO = new PatentStarListDTO();
-        String condition = "AN=" + vo.getPatentNo();
+        String condition = "AN=" + vo.getPatentNo() + " OR " + "PN=" + vo.getPatentNo();
         patentStarListDTO.setCurrentQuery(condition);
-        patentStarListDTO.setDBType("CN");
+        String index = vo.getPatentNo().substring(0, 2);
+        if (index.equals("CN")) {
+            patentStarListDTO.setDBType("CN");
+        } else {
+            patentStarListDTO.setDBType("WD");
+        }
         patentStarListDTO.setOrderBy("AD");
         patentStarListDTO.setOrderByType("DESC");
         patentStarListDTO.setPageNum(1);
@@ -1198,7 +1205,7 @@ public class PatentStarApiService {
         List<String> list = new ArrayList<>();
         List<LegalEvent> legalEvents = new ArrayList<>();
         String cnLegalApi = this.getCnLegalApi(appNo);
-        if (StringUtils.isNotEmpty(cnLegalApi)) {
+        if (StringUtils.isNotEmpty(cnLegalApi) && !cnLegalApi.equals("{}") && !cnLegalApi.contains("408")) {
             List<ExternalLegalStatusDTO> statusDTOS = JSONArray.parseArray(cnLegalApi, ExternalLegalStatusDTO.class);
             if (!CollectionUtils.isEmpty(statusDTOS)) {
                 List<ExternalLegalStatusDTO> statusList = statusDTOS.stream().sorted(Comparator.comparing(ExternalLegalStatusDTO::getLegalDate).reversed()).collect(Collectors.toList());
@@ -1220,6 +1227,7 @@ public class PatentStarApiService {
                 }
             }
         }
+
         infoDTO.setLegalStatus(list);
         infoDTO.setLegalEvents(legalEvents);
         return infoDTO;