20240904 导出任务修改

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

@@ -483,9 +483,13 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             importTaskCondition.updateById();
 
             importTask.setState(exportTaskDTO.getState());
-            importTask.setAllNum(exportTaskDTO.getAllNum());
+            if (exportTaskDTO.getAllNum() != null) {
+                importTask.setAllNum(exportTaskDTO.getAllNum());
+            }
             importTask.setDoneNum(exportTaskDTO.getDoneNum());
-            importTask.setDefaultNum(exportTaskDTO.getDefaultNum());
+            if(exportTaskDTO.getDefaultNum()!=null) {
+                importTask.setDefaultNum(exportTaskDTO.getDefaultNum());
+            }
             importTask.setFinishTime(exportTaskDTO.getFinishTime());
             importTask.updateById();
         }

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

@@ -357,6 +357,7 @@ public class PatentExportService {
 
         EsCustomFieldBatchVO esVO = exportTask.getEsVO();
         List<PatentExportVO> selectedFields = esVO.getSelected();
+        selectedFields=selectedFields.stream().filter(PatentExportVO::getSelected).collect(Collectors.toList());
         Integer taskId = exportTask.getTaskId();
         Integer projectId = exportTask.getProjectId();
         String createId = exportTask.getCreateId();
@@ -384,7 +385,7 @@ public class PatentExportService {
             }
         }
         HSSFWorkbook hssfWorkbook = this.getExportHssWorkbook(headers);
-        HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
         StringRequest queryRequest = new StringRequest();
         BeanUtils.copyProperties(esVO, queryRequest);
 
@@ -410,7 +411,7 @@ public class PatentExportService {
         if (endNum != null && endNum < toNum) {
             toNum = endNum;
         }
-        Integer index = 1;
+        Integer index = 0;
         String json = CommonService.readJsonFile("patent.json");
         List<PatentConfigVO> patentConfigVOS = JSON.parseArray(json, PatentConfigVO.class);
 
@@ -437,7 +438,7 @@ public class PatentExportService {
         this.updateTaskStateToDoing(taskId,total);
         List<Patent> firstPatentList = (List<Patent>) firstRecords.getData();
         List<String> firstPatentNos = firstPatentList.stream().map(Patent::getPatentNo).collect(Collectors.toList());
-        ;
+
         //查询自定义字段
         esQueryPatentFieldsDTO.setPatentNos(firstPatentNos);
         List<EsPatentFieldsVO> firstEsPatentFieldsVOS = esCustomFieldService.getPatentFields(esQueryPatentFieldsDTO);
@@ -450,7 +451,9 @@ public class PatentExportService {
 
             index++;
             importTaskAMVO.setDoneNum(index);
+
             this.sendWebSocketMessage(projectId, taskId, createId, total.intValue(), index, false);
+
         }
 
 
@@ -466,7 +469,7 @@ public class PatentExportService {
             }
 
             esPatentCommonVO.setStartNum(startNum);
-            esPatentCommonVO.setEndNum(endNum);
+            esPatentCommonVO.setEndNum(toNum);
             Records records = this.queryPatents(esPatentCommonVO);
 
             List<Patent> patentList = (List<Patent>) records.getData();
@@ -491,6 +494,7 @@ public class PatentExportService {
 
         }
 
+
         esQueryPatentFieldsDTO.setPatentNos(inNos);
         List<EsPatentFieldsVO> esPatentFieldsVOS = esCustomFieldService.getPatentFields(esQueryPatentFieldsDTO);
         List<Patent> patentList = esPatentService.getPatentsByNo(inNos, true, null, null);
@@ -518,15 +522,17 @@ public class PatentExportService {
                 fileGuid = parseByteToFileUtils.uploadFile(out.toByteArray(), 1);
             }
             exportTask.setFileGuid(fileGuid);
+            exportTask.setState(2);
             Integer reTaskId = importTaskService.updateExportTask(exportTask);
             if (reTaskId == null) {
                 throw new XiaoShiException("导出记录失败");
             }
 
         } catch (FileNotFoundException e) {
+            e.printStackTrace();
             throw new FileNotFoundException();
         } catch (Exception e) {
-
+e.printStackTrace();
         }
     }
 

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -656,6 +656,9 @@ public class EsCustomFieldService {
         List<String> patentNos = esQueryPatentFieldsDTO.getPatentNos();
         List<InnerFields> innerFields = esQueryPatentFieldsDTO.getInnerFields();
 
+        if(innerFields.size()==0){
+            return ;
+        }
         for (String patentNo : patentNos) {
             EsPatentFieldsVO esPatentFieldsVO = new EsPatentFieldsVO();
             esPatentFieldsVO.setPatentNo(patentNo);

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -523,6 +523,9 @@ public class EsPatentService {
      */
     public List<Patent> getPatentsByNo(List<String> patentNos, Boolean ifGetAll, Long current, Long size) throws Exception {
         List<Patent> patentList = new ArrayList<>();
+        if(patentNos==null||patentNos.size()==0){
+            return patentList;
+        }
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("patent");