Merge remote-tracking branch 'origin/master'

src/main/java/com/example/xiaoshiweixinback/entity/dto/patent/PatentColumnDTO.java

@@ -358,11 +358,6 @@ public class PatentColumnDTO {
     /**
      * 专题库或报告id
      */
-    private Integer projectId;
-
-    /**
-     * 专题库或报告id
-     */
     private String productId;
 
     /**
@@ -370,30 +365,10 @@ public class PatentColumnDTO {
      */
     EsProjectTask projectTask;
 
-    /**
-     * 导入任务
-     */
-    ESImportTask importTask;
-
-    /**
-     * 法律状态
-     */
-    List<String> legalStatus;
-
-    /**
-     * 标注
-     */
-    List<Marking> markings;
-
     PatentJoin patentJoin;
 
    private String pictureGuid;
 
-    /**
-     * 法律事件
-     */
-    private List<LegalEvent> legalEvents;
-
     //外部专利的原始申请号
     private String rowApplicationNo;
 

src/main/java/com/example/xiaoshiweixinback/entity/vo/ProductVO.java

@@ -53,4 +53,5 @@ public class ProductVO {
     private List<SystemFile> systemFileList;
     private Integer concernType;
     private Boolean ifHot;
+    private Integer assoId;
 }

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsPatentService.java

@@ -437,7 +437,7 @@ public class EsPatentService {
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("wxpatent");
-        Query q = QueryBuilders.term(i -> i.field("app_no.keyword").value(appNo));
+        Query q = QueryBuilders.term(i -> i.field("patent_no.keyword").value(appNo));
         builder.query(q);
         builder.size(10);
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);

src/main/resources/mapper/ProductMapper.xml

@@ -52,7 +52,7 @@
     <select id="getConcernProduct" resultType="com.example.xiaoshiweixinback.entity.vo.ProductVO">
         select distinct p.id as id,p.name as name,p.description as description,p.sell_platform as sellPlatform,pe.name
         as createName ,p.create_time as createTime,p.best_selling_brand as bestSellingBrand,p.price as
-        price,p.platform_link as platformLink,p.if_hot as ifHot
+        price,p.platform_link as platformLink,p.if_hot as ifHot,app.id as assoId
         from
         asso_person_product as app
         left join product as p on app.product_id =p.id