11/1

src/main/java/cn/cslg/pas/common/dto/business/TortReportTaskDTO.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @Date 2023/12/12
  */
 @Data
-public class TortReportTaskDTO {
+public class ReportAuditTaskDTO {
     private ReportProjectDTO reportProjectDTO;
     private ProjectTaskDTO projectTaskDTO;
 }

src/main/java/cn/cslg/pas/controller/ProjectTaskController.java

@@ -11,9 +11,7 @@ import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
 import cn.cslg.pas.service.business.ProjectTaskService;
 import cn.cslg.pas.service.business.TaskHandleResultService;
-import cn.hutool.http.HttpStatus;
 import io.swagger.v3.oas.annotations.Operation;
-import jakarta.validation.constraints.PastOrPresent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -116,8 +114,8 @@ public class ProjectTaskController {
 
     @Operation(summary = "添加报告开卷审核任务")
     @PostMapping("/addReportOpenAuditTask")
-    public Response addReportOpenAuditTask(@RequestBody TortReportTaskDTO tortReportTaskDTO) throws Exception {
-        Integer id = (Integer) projectTaskService.addReportOpenAuditTask(tortReportTaskDTO);
+    public Response addReportOpenAuditTask(@RequestBody ReportAuditTaskDTO reportAuditTaskDTO) throws Exception {
+        Integer id = (Integer) projectTaskService.addReportOpenAuditTask(reportAuditTaskDTO);
         return Response.success(id);
     }
 

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

@@ -894,12 +894,12 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
     /**
      * 侵权分析报告开卷审核任务
      *
-     * @param tortReportTaskDTO
+     * @param reportAuditTaskDTO
      * @return
      */
-    public Object addReportOpenAuditTask(TortReportTaskDTO tortReportTaskDTO) {
-        ReportProjectDTO reportProjectDTO = tortReportTaskDTO.getReportProjectDTO();
-        ProjectTaskDTO projectTaskDTO = tortReportTaskDTO.getProjectTaskDTO();
+    public Object addReportOpenAuditTask(ReportAuditTaskDTO reportAuditTaskDTO) {
+        ReportProjectDTO reportProjectDTO = reportAuditTaskDTO.getReportProjectDTO();
+        ProjectTaskDTO projectTaskDTO = reportAuditTaskDTO.getProjectTaskDTO();
         //如果报告DTO不为空，则需要先建立报告
         if (reportProjectDTO != null) {
             Integer projectId = (Integer) reportProjectService.addMessage(reportProjectDTO);

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

@@ -240,8 +240,10 @@ public class EsPatentService {
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         if (hits != null && hits.size() > 0) {
-            Patent patent = hits.get(0).source();
-            patentList.add(patent);
+            hits.forEach(item->{
+                Patent patent=item.source();
+                patentList.add(patent);}
+            );
         }
         return patentList;
     }