11/1

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

@@ -47,9 +47,9 @@ public class FTOController {
         return Response.success(tortCompareRecordVO);
     }
 
-    @Operation(summary = "保存侵权对比结果")
-    @PostMapping("/addTortCompareRecord")
-    public Response addTortCompareRecord(@RequestBody TortCompareRecordDTO tortCompareRecordDTO){
+    @Operation(summary = "保存FTO对比结果")
+    @PostMapping("/addFTOCompareRecord")
+    public Response addFTOCompareRecord(@RequestBody TortCompareRecordDTO tortCompareRecordDTO){
         if (tortCompareRecordDTO != null) {
             List<Integer> ids = new ArrayList<>();
             try {
@@ -93,7 +93,7 @@ public class FTOController {
     @GetMapping("/getFTOAssitResult")
     public Response getFTOAssitResult(String patentNo, Integer taskId){
         Integer type = 1;
-        TortCompareRecordVO tortCompareRecordVO = ftoCompareRecordService.getFTOAssitResult(patentNo, null, taskId, type);
+        TortCompareRecordVO tortCompareRecordVO = ftoCompareRecordService.getFTOAssitResult(patentNo, taskId, type);
         return Response.success(tortCompareRecordVO);
     }
 
@@ -108,9 +108,9 @@ public class FTOController {
 
     @Operation(summary = "查询最终结果")
     @GetMapping("/getFTOFinalResult")
-    public Response getFTOFinalResult(String patentNo, Integer projectId, Integer taskId){
+    public Response getFTOFinalResult(String patentNo, Integer taskId){
         Integer type = 2;
-        TortCompareRecordVO tortCompareRecordVO = ftoCompareRecordService.getFTOAssitResult(patentNo, projectId, taskId, type);
+        TortCompareRecordVO tortCompareRecordVO = ftoCompareRecordService.getFTOAssitResult(patentNo,taskId, type);
         return Response.success(tortCompareRecordVO);
     }
 }

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

@@ -425,13 +425,11 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
      * @param taskId
      * @return
      */
-    public TortCompareRecordVO getFTOAssitResult(String patentNo, Integer projectId, Integer taskId, Integer type) {
+    public TortCompareRecordVO getFTOAssitResult(String patentNo, Integer taskId, Integer type) {
         TortCompareRecordVO tortCompareRecordVO = new TortCompareRecordVO();
         // 发起人从任务进入，没有报告id，有taskId
         // 根据taskId查询报告id
-        if (projectId == null && taskId != null) {
-            projectId = tortCompareRecordService.getProjectIdByTaskId(taskId);
-        }
+        Integer projectId = tortCompareRecordService.getProjectIdByTaskId(taskId);
         tortCompareRecordVO.setProjectId(projectId);
         try {
             List<PatentRightVo> patentRightVos = new ArrayList<>();