Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/service/business/TempleService.java

@@ -2,11 +2,7 @@ package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.dto.business.ReportTempleDTO;
 import cn.cslg.pas.common.vo.business.TempleByReportTypeVO;
-import cn.cslg.pas.domain.business.Product;
 import cn.cslg.pas.domain.business.ReportTemple;
-import cn.cslg.pas.domain.es.Patent;
-import cn.cslg.pas.factorys.businessFactory.Business;
-import cn.cslg.pas.mapper.PatentMapper;
 import cn.cslg.pas.mapper.ReportTempleMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.dto.PatentDetailDTO;
 import cn.cslg.pas.common.dto.PatentKinDTO;
 import cn.cslg.pas.common.dto.business.EsCountDTO;
 import cn.cslg.pas.common.dto.business.EsPatentFamilyDTO;
+import cn.cslg.pas.common.dto.business.ReportTempleDTO;
 import cn.cslg.pas.common.dto.business.SelectClaimDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.*;
@@ -13,11 +14,13 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.business.EsCountVO;
 import cn.cslg.pas.common.vo.business.PatentKinVO;
 import cn.cslg.pas.common.vo.business.PatentNoVO;
+import cn.cslg.pas.common.vo.business.TempleByReportTypeVO;
 import cn.cslg.pas.controller.EventController;
 import cn.cslg.pas.controller.PatentController;
 import cn.cslg.pas.domain.es.FamilyPatent;
 import cn.cslg.pas.domain.es.PatentFamilyMessage;
 import cn.cslg.pas.service.business.ProductMarketDataService;
+import cn.cslg.pas.service.business.TempleService;
 import cn.cslg.pas.service.business.es.EsCountService;
 import cn.cslg.pas.service.business.es.EsService;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
@@ -54,7 +57,8 @@ public class EventServiceTests {
     private EsService esService;
     @Autowired
     private EsCountService esCountService;
-
+    @Autowired
+    private TempleService templeService;
 
 
     @Autowired
@@ -260,4 +264,12 @@ public class EventServiceTests {
         List<PatentKinDTO> kinDTOS = esCountService.selectKinByPatentNo(vo);
         System.out.println(kinDTOS);
     }
+
+    @Test
+    void test14() {
+        TempleByReportTypeVO vo = new TempleByReportTypeVO();
+        vo.setReportType(1);
+        List<ReportTempleDTO> reportTempleDTOS = templeService.queryTempleByType(vo);
+        System.out.println(reportTempleDTOS);
+    }
 }