导入申请人 2023/1/9

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

@@ -502,6 +502,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
             patentDTO.setCpcList(patentClassNumberLinkList.stream().filter(patentClassNumber -> patentClassNumber.getPatentId().equals(item.getId()) && patentClassNumber.getType().equals(Constants.PATENT_CLASS_NUMBER_CPC)).map(PatentClassNumberLink::getCode).distinct().collect(Collectors.toList()));
             patentDTO.setUpcList(patentClassNumberLinkList.stream().filter(patentClassNumber -> patentClassNumber.getPatentId().equals(item.getId()) && patentClassNumber.getType().equals(Constants.PATENT_CLASS_NUMBER_UPC)).map(PatentClassNumberLink::getCode).distinct().collect(Collectors.toList()));
             patentDTO.setLocList(patentClassNumberLinkList.stream().filter(patentClassNumber -> patentClassNumber.getPatentId().equals(item.getId()) && patentClassNumber.getType().equals(Constants.PATENT_CLASS_NUMBER_LOC)).map(PatentClassNumberLink::getCode).distinct().collect(Collectors.toList()));
+            patentDTO.setAffair(patentAffairService.getPatentAffairByPatentId(item.getId()));
             if (StringUtils.isNotEmpty(item.getAgencyId())) {
                 patentDTO.setAgency(patentAgencyList.stream().filter(patentAgency -> patentAgency.getId().equals(Integer.parseInt(item.getAgencyId()))).findFirst().orElse(null));
             }

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

@@ -232,6 +232,10 @@ public class UploadPatentBatchService {
             patentSimplyFamilyBusiness(uploadParamsVO);
             //发明人 OS_PATENT_INVENTOR
             patentInventorBusiness(uploadParamsVO);
+            if(uploadParamsVO.getPatentApplicantOriginalName() == null)
+            {uploadParamsVO.setPatentApplicantOriginalName(uploadParamsVO.getPatentApplicantStandardOriginalName());}
+            if(uploadParamsVO.getPatentApplicantCurrentName() == null)
+            {uploadParamsVO.setPatentApplicantCurrentName(uploadParamsVO.getPatentApplicantStandardCurrentName());}
             //申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
             if (uploadParamsVO.getPatentApplicantStandardCurrentName() != null && uploadParamsVO.getPatentApplicantOriginalName() != null && uploadParamsVO.getPatentApplicantStandardOriginalName() != null) {
                 patentApplicationBusiness(uploadParamsVO);