Merge remote-tracking branch 'origin/master'

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

@@ -104,7 +104,7 @@ public class EsPatentService {
         List<Hit<Patent>> hits = response.hits().hits();
         for (Hit<Patent> hit : hits) {
             Patent esMess = hit.source();
-            BeanUtils.copyProperties(esMess, dto);
+            dto = esService.getPatentColumnDTO(esMess, vo.getProjectId(), hit.id());
             //格式化权利要求
             List<Text> claims = dto.getClaim();
             if (claims != null && claims.size() > 0) {
@@ -112,17 +112,6 @@ public class EsPatentService {
                     item.setTextContent(PatentRightUtils.getFormatClaim(item.getTextContent(), item.getLanguage()));
                 });
             }
-            dto.setRightHolderAddr(esMess.getRightHolderAddr());
-            dto.setApplicantAddr(esMess.getApplicantAddr());
-            if (!CollectionUtils.isEmpty(esMess.getApplicant())) {
-                dto.setApplicant(this.loadName(esMess.getApplicant()));
-            }
-            if (!CollectionUtils.isEmpty(esMess.getRightHolder())) {
-                dto.setRightHolder(this.loadName(esMess.getRightHolder()));
-            }
-            if (!CollectionUtils.isEmpty(esMess.getInventor())) {
-                dto.setInventor(this.loadName(esMess.getInventor()));
-            }
             if (esMess.getPatentNo().equals(vo.getPatentNo())) {
                 break;
             }