删除 2022/12/9

RMS/src/main/java/cn/cslg/report/common/model/vo/TaskParams.java

@@ -22,6 +22,7 @@ public class TaskParams implements Serializable {
     private String oldName;
     private Integer total;
     private Integer index;
+    private String signPatentNo;
 
     public TaskParams() {
 

RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java

@@ -136,7 +136,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
                 return "";
             }
             String signPatentNO = reportService.list(wrapper1).get(0).getSignPatentNo();
-            patentNos.add(signPatentNO);
+          patentNos.add(signPatentNO);
             patentVO.setNotInPatentNos(patentNos);
             //详情见outInterfaceService.getPatentFromPAS
             res = outInterfaceService.getPatentFromPAS(patentVO, 0);
@@ -227,7 +227,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             wrapper.select(CompareFiles::getPatentNo)
                     .eq(CompareFiles::getReportId, compareFilesVO.getReportId())
                     //分页查询 传的起始条数和结束条数
-                    .last("limit" + (compareFilesVO.getStartNumber() - 1) + "," + compareFilesVO.getEndNumber());
+                    .last("limit " + (compareFilesVO.getStartNumber() - 1) + "," + compareFilesVO.getEndNumber());
             patentNos = this.list(wrapper).stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         }
         //减少的专利号

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java

@@ -107,6 +107,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
       }
       if(reportFieldVO.getReportType()!=null){
           queryWrapper.like(ReportField::getReportType, reportFieldVO.getReportType());
+          queryWrapper.isNull((ReportField::getReportId));
       }
       queryWrapper.orderByDesc(ReportField::getId);
       if (reportFieldVO.getSize() != null && reportFieldVO.getSize() != null) {
@@ -296,8 +297,9 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
         }
         List<Integer> valueIds =list.stream().map(PatentQueryFieldSourceVO::getKey).collect(Collectors.toList());
         LambdaQueryWrapper<ReportFieldPatentLink> lambdaQueryWrapper =new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(ReportFieldPatentLink::getFieldId,params.getFieldId())
-                .in(ReportFieldPatentLink::getOptionId,valueIds);
+        lambdaQueryWrapper.eq(ReportFieldPatentLink::getFieldId,params.getFieldId());
+                if(valueIds!=null&&valueIds.size()>0){
+                    lambdaQueryWrapper .in(ReportFieldPatentLink::getOptionId,valueIds);}
         List<ReportFieldPatentLink> reportFieldPatentLinks =reportFieldPatentLinkService.list(lambdaQueryWrapper);
         if(reportFieldPatentLinks.size()==0) {
             list.forEach(item->item.setCount(0));