1.5 lrj

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

@@ -66,7 +66,6 @@ public class PatentApplicantService extends ServiceImpl<PatentApplicantMapper, P
         List<PatentApplicant> patentApplicantList = this.getPatentApplicantByIds(applicantIds);
         return this.setPatentApplicantDataList(patentApplicantLinkList, patentApplicantList);
     }
-
     private List<PatentApplicant> setPatentApplicantDataList(List<PatentApplicantLink> patentApplicantLinkList, List<PatentApplicant> patentApplicantList) {
         List<PatentApplicant> dataList = new ArrayList<>();
         patentApplicantLinkList.forEach(attribute -> {

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

@@ -712,8 +712,6 @@ public String getConPantentNos(QueryPatentVO params){
             patentFamily.setSimple(familyPatentNos);
             patentDTO.setFamily(patentFamily);
         }
-
-
                 patentDTO.setApplicationDate(DateUtils.formatDate(patent.getApplicationDate(), DateUtils.YYYY_MM_DD));
         patentDTO.setPriorityDate(DateUtils.formatDate(patent.getPriorityDate(), DateUtils.YYYY_MM_DD));
         patentDTO.setPublicDate(DateUtils.formatDate(patent.getPublicDate(), DateUtils.YYYY_MM_DD));

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

@@ -169,7 +169,6 @@ public class UploadPatentBatchService {
                 }
                 //将装配对象中的数据保存到数据库
                 dataToDBBro(params, uploadParamsVO);
-
             ImportTaskPatent importTaskPatent =new ImportTaskPatent();
             importTaskPatent.setImportTaskId(params.getTaskId());
             importTaskPatent.setPatentNo(uploadParamsVO.getPatent().getPatentNo());
@@ -325,6 +324,10 @@ public class UploadPatentBatchService {
             //发明人 OS_PATENT_INVENTOR
             patentInventorBusiness(uploadParamsVO);
             //申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
+            if(uploadParamsVO.getPatentApplicantOriginalName() == null)
+            {uploadParamsVO.setPatentApplicantOriginalName(uploadParamsVO.getPatentApplicantStandardOriginalName());}
+            if(uploadParamsVO.getPatentApplicantCurrentName() == null)
+            {uploadParamsVO.setPatentApplicantCurrentName(uploadParamsVO.getPatentApplicantStandardCurrentName());}
             if (uploadParamsVO.getPatentApplicantStandardCurrentName() != null && uploadParamsVO.getPatentApplicantOriginalName() != null && uploadParamsVO.getPatentApplicantStandardOriginalName() != null) {
                 patentApplicationBusiness(uploadParamsVO);
             }
@@ -560,7 +563,6 @@ List<String>  standardName = uploadParamsVO.getPatentApplicantStandardCurrentNam
             patentAffairParams.setSimpleStatus(simpleStatus);
         }
         patentAffairParams.setPatentId(uploadParamsVO.getPatent().getId());
-
         patentAffairService.updatePatientAffair(patentAffairParams);
     }