检索接口

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

@@ -760,6 +760,10 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
     public PatentDTO getPatentDTOById(String patentNo, Integer projectId) {
         LambdaQueryWrapper<Patent> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Patent::getPatentNo, patentNo);
+        if(patentNo.contains("CN")){
+            wrapper.or().eq(Patent::getPublicNo,patentNo)
+                    .or().eq(Patent::getPublicAccreditNo,patentNo);
+        }
         List<Patent> patents = this.list(wrapper);
         PatentDTO patentDTO = new PatentDTO();
         //如果未查出专利则返回为空
@@ -768,11 +772,9 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         }
         Patent patent = patents.get(0);
 
-
         BeanUtils.copyProperties(patent, patentDTO);
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList(Constants.PATENT_TYPE, Constants.PATENT_SIMPLE_STATUS, Constants.COUNTRIES));
         List<PatentClassNumberLink> patentClassNumberLinkList = patentClassNumberLinkService.getPatentClassNumberLinkByPatentIds(Collections.singletonList(patent.getId()));
-
         if (patent.getPriorityNo() != null) {
             patentDTO.setPriorityNo(patent.getPriorityNo());
         } else {