5/27 修改添加标引问题

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -112,7 +112,7 @@ public class EsCustomFieldService {
                 ;
             case 2:              //文本类型
                 if (optionType.equals(1) || optionType.equals(2)) {
-                    if (addValues != null && addValues.size() == 1)
+                    if (addValues != null)
                         esCustomField.setFieldValue(addValues);
                     esCustomField.setStatsValue(addValues);
                 } else if (optionType.equals(0)) {
@@ -122,7 +122,7 @@ public class EsCustomFieldService {
                 break;
             case 4:     //单选
                 if (optionType.equals(1) || optionType.equals(2)) {
-                    if (addValues != null && addValues.size() == 1) {
+                    if (addValues != null) {
                         esCustomField.setFieldValue(addValues);
                         esCustomField.setStatsValue(addValues);
                     }
@@ -147,7 +147,7 @@ public class EsCustomFieldService {
                     esCustomField.setFieldValue(orgValue);
                     esCustomField.setStatsValue(orgValue);
                 } else if (optionType.equals(2)) {
-                    if (addValues != null && addValues.size() > 0) {
+                    if (addValues != null) {
                         esCustomField.setFieldValue(addValues);
                         esCustomField.setStatsValue(addValues);
                     } else {

src/main/java/cn/cslg/pas/service/importPatent/GetPatentFromExcelThread.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.dto.UploadPatentWebDTO;
 import cn.cslg.pas.common.dto.business.EsPatentFamilyDTO;
 import cn.cslg.pas.common.dto.es.EsCustomFieldDTO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
+import cn.cslg.pas.common.model.importTaskModel.PatentInventor;
 import cn.cslg.pas.common.utils.ReadExcelUtils;
 import cn.cslg.pas.common.utils.esDataForm.PatentClassifySplitter;
 import cn.cslg.pas.common.vo.ImportTaskAMVO;
@@ -257,11 +258,10 @@ public class GetPatentFromExcelThread extends Thread {
                 patentPeople.add(patentPerson);
             }
             patent.setApplicant(patentPeople);
-
         }
-        List<String> rightNames = uploadParamsVO.getPatentApplicantCurrentName();
 
-        //申请人
+        //权利人
+        List<String> rightNames = uploadParamsVO.getPatentApplicantCurrentName();
         if (rightNames != null && rightNames.size() != 0) {
             List<PatentPerson> patentPeople = new ArrayList<>();
             for (int i = 0; i < rightNames.size(); i++) {
@@ -274,6 +274,22 @@ public class GetPatentFromExcelThread extends Thread {
             patent.setRightHolder(patentPeople);
 
         }
+
+        //发明人
+        List<PatentInventor> patentInventorList = uploadParamsVO.getPatentInventorList();
+        if (patentInventorList != null && patentInventorList.size()>0) {
+            List<PatentPerson> patentPeople = new ArrayList<>();
+            for (int i = 0; i < patentInventorList.size(); i++) {
+                PatentPerson patentPerson = new PatentPerson();
+                patentPerson.setOrder(i + 1);
+                patentPerson.setType("1");
+                patentPerson.setName(patentInventorList.get(i).getName());
+                patentPeople.add(patentPerson);
+            }
+            patent.setInventor(patentPeople);
+
+        }
+
         List<String> ipcList = uploadParamsVO.getIpcList();
         String mainIpc = uploadParamsVO.getMainIpc();
         //装载IPC分类号
@@ -296,7 +312,6 @@ public class GetPatentFromExcelThread extends Thread {
             patent.setIpc(patentClassifies);
         }
 
-
         //装载CPC分类号
         List<String> cpcList = uploadParamsVO.getCpcList();
         if (cpcList != null && cpcList.size() > 0) {

src/main/resources/application-dev.yml

@@ -63,7 +63,7 @@ spring:
       initialize-schema: always
 authorUrl: http://localhost:8885
 PCSUrl: http://localhost:8885
-#OPSUrl: http://192.168.2.24:5001
+#OPSUrl: http://192.168.2.24:g5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879
 FMSUrl: http://localhost:8803