8/27 定时更新修改

src/main/java/cn/cslg/pas/common/utils/ClaimUtils/ClaimSplitUtils.java

@@ -195,7 +195,7 @@ public class ClaimSplitUtils {
     private static void reDefaultPatentClaim(ArrayList<RePatentClaim> patentRights, String content) {
         patentRights.clear();
         RePatentClaim rePatentClaim = new RePatentClaim();
-        rePatentClaim.setSort(1);
+        rePatentClaim.setSort(0);
         rePatentClaim.setContent(content);
         rePatentClaim.setParentSort("-1");
         patentRights.add(rePatentClaim);
@@ -426,7 +426,7 @@ public class ClaimSplitUtils {
         String[] contents = content.split("@##");
         for (int i = 0; i < contents.length; i++) {
             RePatentClaim rePatentClaim = new RePatentClaim();
-            rePatentClaim.setSort(i + 1);
+            rePatentClaim.setSort(i);
             rePatentClaim.setContent(contents[i]);
             arrayList.add(rePatentClaim);
         }

src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -282,19 +282,21 @@ public class ReportExportService {
                     tortMap.put("targetDescription", ftoCompareRecordVO.getTargetDescription());
                     Integer result = ftoCompareRecordVO.getCompareResult();
                     System.out.println(result);
-                    switch (result) {
-                        case 0:
-                            tortMap.put("resultStr", "字面相同");
-                            break;
-                        case 1:
-                            tortMap.put("resultStr", "等同");
-                            break;
-                        case 2:
-                            tortMap.put("resultStr", "不等同");
-                            break;
-                        case 3:
-                            tortMap.put("resultStr", "确定");
-                            break;
+                    if(result!=null) {
+                        switch (result) {
+                            case 0:
+                                tortMap.put("resultStr", "字面相同");
+                                break;
+                            case 1:
+                                tortMap.put("resultStr", "等同");
+                                break;
+                            case 2:
+                                tortMap.put("resultStr", "不等同");
+                                break;
+                            case 3:
+                                tortMap.put("resultStr", "确定");
+                                break;
+                        }
                     }
                     tortMap.put("compareDescription", ftoCompareRecordVO.getCompareDescription());
                 }

src/main/java/cn/cslg/pas/service/importPatent/SchedulingTaskService.java

@@ -44,8 +44,9 @@ public class SchedulingTaskService {
     private List<ImportTaskAMVO> importTaskAMVOS;
     @Autowired
     private WebVOTransformService webVOTransformService;
-   @Autowired
-   private PatentProjectService patentProjectService;
+    @Autowired
+    private PatentProjectService patentProjectService;
+
     public void startTask() {
         Integer freeCount = Constants.MAX_IMPORT_TASK_COUNT - threadPoolTaskExecutor.getActiveCount();
         if (importTaskAMVOS == null) {
@@ -105,9 +106,9 @@ public class SchedulingTaskService {
         for (ImportTask importTask : importTaskList) {
 
             ImportTaskCondition importTaskCondition = importTaskConditions.stream().filter(item -> item.getId().equals(importTask.getImportTaskConditionId())).findFirst().orElse(null);
-            LambdaQueryWrapper<PatentProject> queryWrapper =new LambdaQueryWrapper<>();
-            queryWrapper.eq(PatentProject::getProjectId,importTaskCondition.getProjectId());
-            PatentProject project = patentProjectService.getOne(queryWrapper);
+            LambdaQueryWrapper<PatentProject> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(PatentProject::getProjectId, importTaskCondition.getProjectId());
+
             ImportTaskAMVO importTaskAMVO = new ImportTaskAMVO();
             BeanUtils.copyProperties(importTask, importTaskAMVO);
             if (importTaskCondition != null) {
@@ -122,7 +123,11 @@ public class SchedulingTaskService {
                 importTaskAMVO.setProjectType(importTaskCondition.getProjectType());
                 importTaskAMVO.setPatentNoStr(importTaskCondition.getPatentNos());
                 importTaskAMVO.setPdfType(importTaskCondition.getPdfType());
-                importTaskAMVO.setUpdateCycle(project.getUpdateCycle());
+                PatentProject project = patentProjectService.getOne(queryWrapper);
+                if (project != null) {
+
+                        importTaskAMVO.setUpdateCycle(project.getUpdateCycle());
+                }
                 if (importTaskCondition.getCustomFields() != null) {
                     JSONArray jsonArray = JSONArray.parseArray(importTaskCondition.getCustomFields());
                     List<EsCustomFieldDTO> dtos = jsonArray.toJavaList(EsCustomFieldDTO.class);
@@ -130,7 +135,7 @@ public class SchedulingTaskService {
                 }
 
                 //定时任务
-                if (importTaskCondition.getIfCycle()!= null && importTaskCondition.getIfCycle()&&importTask.getUpdateToDate()!=null) {
+                if (importTaskCondition.getIfCycle() != null && importTaskCondition.getIfCycle() && importTask.getUpdateToDate() != null) {
                     List<EsCustomFieldDTO> dtoList = webVOTransformService.getEsCustomFieldDTOList(importTaskAMVO);
                     if (importTaskAMVO.getFieldDTOS() == null) {
                         importTaskAMVO.setFieldDTOS(dtoList);