修改导入功能申请人部分 3/21

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

@@ -438,8 +438,16 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
         String code;
         //权利要求
         String content = params.getContent();
+        if(content!=null) {
+            content = content.replaceAll("\n", "");
+            content = content.replaceAll("\r", "");
+        }
         //权利要求(译)
         String contentOut = params.getContentOut();
+        if(contentOut!=null){
+            contentOut =contentOut.replaceAll("\n","");
+            contentOut =contentOut.replaceAll("\r","");
+        }
         //独立权利要求
         String selfContent = params.getSelfContent();
         if (StringUtils.isNotEmpty(content)) {
@@ -452,17 +460,11 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                 case "CN":
                     code = "。";
                     if (StringUtils.isNotEmpty(contentOut)) {
-                        contentOut = contentOut.replaceAll("\n", "");
-                        content = content.replaceAll("\r","");
                         contentOutArray = StringUtils.split(contentOut, code);
                     }
                     if (StringUtils.isNotEmpty(selfContent)) {
-                        selfContent = selfContent.replaceAll("\n", "");
-                        content = content.replaceAll("\r","");
                         selfContentArray = StringUtils.split(selfContent, code);
                     }
-                    content = content.replaceAll("\n", "");
-                    content = content.replaceAll("\r","");
                     contentArray = StringUtils.split(content, code);
                     break;
                 default:

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

@@ -662,8 +662,19 @@ public class UploadPatentBatchService {
     @Transactional(rollbackFor = Exception.class)
     public String dataToDBCell(PatentCell patentCell) {
         UploadParamsVO uploadParamsVO = new UploadParamsVO();
-        uploadParamsVO.setPatent(new Patent());
-        uploadParamsVO.getPatent().setPatentNo(patentCell.getPatentNo());
+        Patent patent =new Patent();
+        //设置专利号
+        patent.setPatentNo(patentCell.getPatentNo());
+        //设置摘要
+        patent.setAbstractStr(patentCell.getAbstrc());
+        //设置标题
+        patent.setName(patentCell.getTitle());
+        uploadParamsVO.setPatent(patent);
+        //设置公开号
+//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
+//        Date date = simpleDateFormat.parse(patentCell.getPubilcDate());
+//        long ts = date.getTime();
+//        patent.setPublicDate();
         getOneOrInsertOne(uploadParamsVO);
         uploadParamsVO.setSimpleStatus(patentCell.getStatue());
         try {