xiexiang пре 1 година
родитељ
комит
1199011433

+ 1 - 0
src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -408,6 +408,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         if (importTaskConditionId != null) {
             ImportTask importTask = new ImportTask();
             importTask.setImportTaskConditionId(importTaskConditionId);
+            //设置任务的类型 6导出excel  7导出pdf首页
             importTask.setType(exportTaskDTO.getType());
             importTask.setAllNum(exportTaskDTO.getAllNum());
             importTask.setFinishTime(exportTaskDTO.getFinishTime());

+ 1 - 0
src/main/java/cn/cslg/pas/service/business/PDFExportFirstPageService.java

@@ -65,6 +65,7 @@ public class PDFExportFirstPageService {
         List<String> patentNos = this.getPatentNo(EsVO);
         Integer total = patentNos.size();
         Integer defaultNum = 0;
+
         PDFMergerUtility merger = new PDFMergerUtility();
         PDDocument resultDocument = new PDDocument();
         for (int i = 0; i < patentNos.size(); i++) {

+ 2 - 2
src/main/resources/jsons/importTask.json

@@ -28,7 +28,7 @@
     "ifAsCondition": "true"
   },
   {
-    "name": "导入方式",
+    "name": "导入/导出方式",
     "type": "Array",
     "value": "type",
     "field": "type",
@@ -42,7 +42,7 @@
     "ifAsCondition": "false"
   },
   {
-    "name": "导入方式",
+    "name": "导入/导出方式",
     "type": "String",
     "value": "type",
     "field": "type",