调整部分前段显示接口的代码

PAS/src/main/java/cn/cslg/pas/common/model/vo/UploadParamsVO.java

@@ -16,6 +16,7 @@ public class UploadParamsVO {
      * 专利
      */
     private Patent patent;
+    private String patentSimpleStatus;
 
     /**
      * 权利要求

PAS/src/main/java/cn/cslg/pas/common/model/vo/UploadSettingVO.java

@@ -25,6 +25,11 @@ public class UploadSettingVO {
     private String sourceName;
 
     /**
+     * 数据来源中文名称
+     */
+    private String name;
+
+    /**
      * 可配置属性 包含与数据来源文件(Excel文件)中的字段相对应的属性字段 是一个数组
      */
     private List<Column> column;

PAS/src/main/java/cn/cslg/pas/common/utils/DataProcessHandler.java

@@ -126,7 +126,7 @@ class PatSnapPatentAffairHandler implements IProcessData {
 class IncoPatPatentAffairHandler implements IProcessData {
     @Override
     public Object processData(Object data, Object code) {
-        String processedData = data.toString().replaceAll("\n", "");
+        String processedData = data.toString().replaceAll("\r\n", "");
         List<String> contentList = StringUtils.changeStringToString(processedData, "([\\u4e00-\\u9fa5]+)：");
         contentList.remove(0);
 

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

@@ -473,7 +473,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
         if (patent.getPriorityNo() != null) {
             patentDTO.setPriorityNo(patent.getPriorityNo());
         } else {
-            patentDTO.setPatentNo("");
+            patentDTO.setPriorityNo("");
         }
 
         if (patent.getPriorityCountry() != null) {

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

@@ -1,19 +1,15 @@
 package cn.cslg.pas.service;
 
-import cn.cslg.pas.common.core.base.EStatus;
-import cn.cslg.pas.common.model.BaseEntity;
 import cn.cslg.pas.common.model.dto.PatentDTO;
+import cn.cslg.pas.common.model.vo.ProjectFieldVO;
 import cn.cslg.pas.common.model.vo.UploadSettingVO;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.mapper.ProjectFieldMapper;
-import cn.cslg.pas.common.model.vo.ProjectFieldVO;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -188,16 +184,14 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
         result.put("classify", classifys);
         result.put("folder", projectFolderService.getProjectFolderTreeNode(projectId, folderList));
 
-        //数据源参数
+        //数据源名称
         String getSettingJson = fileUtils.analysisJsonFile();
-        List<UploadSettingVO> test = JsonUtils.jsonToList(getSettingJson, UploadSettingVO.class);
-
+        List<UploadSettingVO> settingJsonList = JsonUtils.jsonToList(getSettingJson, UploadSettingVO.class);
         List<ProjectField.dataType> dataTypesLst = new ArrayList<>();
-
-        Objects.requireNonNull(test).forEach(item -> {
+        Objects.requireNonNull(settingJsonList).forEach(item -> {
             ProjectField.dataType dataType = new ProjectField.dataType();
             dataType.setId(item.getSourceId());
-            dataType.setName(item.getSourceName());
+            dataType.setName(item.getName());
             dataTypesLst.add(dataType);
         });
         result.put("dataType", dataTypesLst);

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

@@ -819,7 +819,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
                         //专利信息许可人
                         //patentLicensorService.updatePatentLicensor(patentLicensorParams);
                         //专利信息事务信息
-                        //patentAffairService.updatePatientAffair(patentAffairParams);
+                        patentAffairService.updatePatientAffair(patentAffairParams);
                         //权利人
                         //patentApplicantLinkService.updatePatentApplicantLink(patentApplicantCurrentName, patentApplicantStandardCurrentName, 1, patent.getId());
                         //申请人

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

@@ -128,6 +128,12 @@ public class UploadPatentBatchService {
     private void dataToDB(TaskParams params, UploadParamsVO uploadParamsVO, ProjectImportPatentVO projectImportPatentVO) {
         //专利信息 OS_PATENT
         if (uploadParamsVO.getPatent() != null) {
+            List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Collections.singletonList(Constants.PATENT_SIMPLE_STATUS));
+            Integer simpleStatus = Integer.parseInt(systemDictList.stream()
+                    .filter(systemDict -> systemDict.getType().equals(Constants.PATENT_SIMPLE_STATUS) && systemDict.getLabel().equals(uploadParamsVO.getPatentSimpleStatus()))
+                    .findFirst()
+                    .orElse(new SystemDict()).getValue());
+            uploadParamsVO.getPatent().setSimpleStatus(simpleStatus);
             uploadParamsVO.getPatent().updateById();
         }
         //权利要求 OS_PATENT_RIGHT
@@ -154,9 +160,9 @@ public class UploadPatentBatchService {
         patentInventorBusiness(uploadParamsVO);
         //申请人/权利人 OS_APPLICATION_ATTR
         //权利人
-        patentCurrentApplicationBusiness(uploadParamsVO);
+        //patentCurrentApplicationBusiness(uploadParamsVO);
         //申请人
-        patentOriginalApplicationBusiness(uploadParamsVO);
+        //patentOriginalApplicationBusiness(uploadParamsVO);
         //专题库关联专利信息 OS_THEMATIC_PID
         if (uploadParamsVO.getPatent() != null) {
             patentThematicPidBusiness(uploadParamsVO, projectImportPatentVO);