Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/dto/es/EsMergePersonDTO.java

@@ -0,0 +1,19 @@
+package cn.cslg.pas.common.dto.es;
+
+import lombok.Data;
+
+@Data
+public class EsMergePersonDTO {
+
+    private String id;
+
+    private String routing;
+
+    private String name;
+
+    private Integer order;
+
+    private String type;
+
+    private String projectId;
+}

src/main/java/cn/cslg/pas/common/dto/patentCount/GetEsAllPersonDTO.java

@@ -8,13 +8,9 @@ import java.util.List;
 @Data
 public class GetEsAllPersonDTO {
 
-    private List<String> applicant;
+    private List<String> mergeApplicant;
 
-    private List<String> rightHolder;
+    private List<String> mergeRightHolder;
 
-    private List<String> inventor;
-
-    private PersonAddress applicantAddr;
-
-    private PersonAddress rightHolderAddr;
+    private List<String> mergeInventor;
 }

src/main/java/cn/cslg/pas/common/vo/business/MergePersonAgainVO.java

@@ -6,9 +6,9 @@ import java.util.List;
 
 @Data
 public class MergePersonAgainVO {
-
+    //已存在的合并后名称
     private List<String> needMergedName;
-
+    //存在再次要合并的名称
     private List<String> mergedName;
 
     private Integer projectId;

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

@@ -180,6 +180,15 @@ public class EsPatentService {
         return collect;
     }
 
+    //通用返回合并申请人、合并权利人、合并发明人
+    public List<String> loadMergeName(List<PatentMergePerson> list) {
+        List<String> collect = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(list)) {
+            collect = list.stream().map(PatentMergePerson::getName).collect(Collectors.toList());
+        }
+        return collect;
+    }
+
     /**
      * 获得中国专利pdf全文
      *

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

@@ -142,7 +142,7 @@ public class EsProductPatentService {
         return response.hits().total().value();
     }
 
-//添加
+    //添加
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public String addProductPatent(String patentId, Integer productId) throws Exception {
         Patent patent = new Patent();
@@ -151,7 +151,7 @@ public class EsProductPatentService {
         patentJoin.setName("product");
         patent.setPatentJoin(patentJoin);
         patent.setProductId(productId);
-      String id=  esService.addChildPatent(patent,patentId);
+        String id=  esService.addChildPatent(patent,patentId);
         return id;
     }
 }

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -18,6 +18,7 @@ import cn.cslg.pas.controller.PatentController;
 import cn.cslg.pas.domain.es.FamilyPatent;
 import cn.cslg.pas.domain.es.Patent;
 import cn.cslg.pas.domain.es.PatentFamilyMessage;
+import cn.cslg.pas.service.business.MergePersonService;
 import cn.cslg.pas.service.business.ProductMarketDataService;
 import cn.cslg.pas.service.business.ReportTempleService;
 import cn.cslg.pas.service.business.es.EsCountService;
@@ -61,6 +62,8 @@ public class EventServiceTests {
     private EsPatentService patentService;
     @Autowired
     private EsCustomFieldService esCustomFieldService;
+    @Autowired
+    private MergePersonService mergePersonService;
 
 
     @Autowired