20240929 添加查新对比记录

src/main/java/cn/cslg/pas/exception/XiaoShiException.java

@@ -19,7 +19,6 @@ public class XiaoShiException extends RuntimeException {
         this.errorMessage = errorMessage;
     }
 
-
     public String getErrorCode() {
         return errorCode;
     }

src/main/java/cn/cslg/pas/service/novelty/NoveltyExportReportService.java

@@ -62,8 +62,8 @@ public class NoveltyExportReportService {
             return references.getFileGuid();
         } else {
             return this.addReportReference(noveltyReportReferences);
-        }
-
+        } 
+        
     }
 
     private String addReportReference(NoveltyReportReferences noveltyReportReferences) throws Exception {

src/main/java/cn/cslg/pas/service/quartzService/SysImportPatentJobService.java

@@ -46,6 +46,9 @@ public class SysImportPatentJobService extends QuartzJobBean {
          List<String> cycles =this.getCnCycles();
         LambdaQueryWrapper<PatentProject> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PatentProject::getIfUpdate, true);
+                if(cycles!=null&&cycles.size()>0){
+                    queryWrapper.in(PatentProject::getUpdateCycle,cycles);
+                }
         List<PatentProject> patentProjects = patentProjectService.list(queryWrapper);
         if (patentProjects != null && patentProjects.size() != 0) {
             List<Integer> projectId = patentProjects.stream().map(PatentProject::getProjectId).collect(Collectors.toList());
@@ -59,9 +62,8 @@ public class SysImportPatentJobService extends QuartzJobBean {
             importTaskConditions.forEach(item -> {
 
                 PatentProject project = patentProjects.stream().filter(t -> t.getProjectId().equals(item.getProjectId())).findFirst().orElse(null);
-                if(item.getDbType()==null||!item.getDbType().equals("CN")||(item.getDbType().equals("CN")&&cycles.contains(project.getUpdateCycle())))
-                {                importTaskService.addImportTaskByCondition(item, project);
-                }
+                             importTaskService.addImportTaskByCondition(item, project);
+
             });
         }