3/14

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

@@ -104,7 +104,10 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
             throw new XiaoShiException("splitType不能为空");
         }
         //根据任务id获取报告id
-        Integer projectId = tortCompareRecordService.getProjectIdByTaskId(taskId);
+        Integer projectId = getFeatureSplitDTO.getProjectId();
+        if (projectId == null) {
+            projectId = tortCompareRecordService.getProjectIdByTaskId(taskId);
+        }
         getFeatureSplitDTO.setProjectId(projectId);
         //返回的VO类
         TortCompareRecordVO tortCompareRecordVO = new TortCompareRecordVO();
@@ -127,7 +130,7 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
             //如果重拆需要清空特征表
             patentRightVos = featureService.splitPatentFeature(splitVO);
         } catch (Exception e) {
-            throw new XiaoShiException("查询特征出错");
+            tortCompareRecordVO = new TortCompareRecordVO();
         }
         //装载权要部分
         if (!patentRightVos.isEmpty()) {

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

@@ -1231,27 +1231,27 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         } else {
             markedFields.forEach(item -> {
 
-               if(item.getValues()!=null&&item.getValues().size()>0){
-                   item.getValues().forEach(i->{
-                       AssoTaskField assoTaskField = new AssoTaskField();
-                       assoTaskField.setFieldId(item.getFieldId());
-                       assoTaskField.setFieldType(item.getFieldType());
-                       assoTaskField.setTaskId(taskId);
-                       assoTaskField.setTaskBatchId(batchId);
-                       assoTaskField.setProjectId(projectId);
-                       assoTaskField.setFieldValueId(i);
-                       assoTaskFields.add(assoTaskField);
-                   });
-               }
-              else {
-                   AssoTaskField assoTaskField = new AssoTaskField();
-                   assoTaskField.setFieldId(item.getFieldId());
-                   assoTaskField.setFieldType(item.getFieldType());
-                   assoTaskField.setTaskId(taskId);
-                   assoTaskField.setTaskBatchId(batchId);
-                   assoTaskField.setProjectId(projectId);
-                   assoTaskField.setFieldValueId(0);
-               }
+                if (item.getValues() != null && item.getValues().size() > 0) {
+                    item.getValues().forEach(i -> {
+                        AssoTaskField assoTaskField = new AssoTaskField();
+                        assoTaskField.setFieldId(item.getFieldId());
+                        assoTaskField.setFieldType(item.getFieldType());
+                        assoTaskField.setTaskId(taskId);
+                        assoTaskField.setTaskBatchId(batchId);
+                        assoTaskField.setProjectId(projectId);
+                        assoTaskField.setFieldValueId(i);
+                        assoTaskFields.add(assoTaskField);
+                    });
+                } else {
+                    AssoTaskField assoTaskField = new AssoTaskField();
+                    assoTaskField.setFieldId(item.getFieldId());
+                    assoTaskField.setFieldType(item.getFieldType());
+                    assoTaskField.setTaskId(taskId);
+                    assoTaskField.setTaskBatchId(batchId);
+                    assoTaskField.setProjectId(projectId);
+                    assoTaskField.setFieldValueId(0);
+                    assoTaskFields.add(assoTaskField);
+                }
             });
 
         }

src/main/java/cn/cslg/pas/service/business/invalidReport/PatentClaimHistoryService.java

@@ -178,13 +178,17 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
         return historyVOMap;
     }
 
-
+    /**
+     * 删除权要
+     * @param patentClaimDTO
+     */
     public void deletePatentClaim(PatentClaimDTO patentClaimDTO) {
+        // 参数定义
         Integer claimId = patentClaimDTO.getClaimId();
-        //判空
         Boolean ifFirst = patentClaimDTO.getIfFirst();
         // 根据权要id查询所有原权要
         List<PatentClaim> patentClaims = this.getAllPatentClaims(claimId);
+        // 获取所有原权要id
         List<Integer> allOriginalClaimIds = patentClaims.stream().map(PatentClaim::getId).collect(Collectors.toList());
         // 除去已经删除的
         LambdaQueryWrapper<PatentClaimHistory> isDeleteWrapper = new LambdaQueryWrapper<>();