Przeglądaj źródła

fix:考生字典导入和考务数据导入生成报错excel更新

caozixuan 1 rok temu
rodzic
commit
178400c843

+ 2 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationImportTemplateService.java

@@ -231,7 +231,8 @@ public class AsyncExaminationImportTemplateService extends AsyncImportTaskTemple
         }
         for (int i = 0; i < cellCount; i++) {
             sheet.autoSizeColumn(i);
-            sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
+            int width = sheet.getColumnWidth(i)  * 17 / 10;
+            sheet.setColumnWidth(i, Math.min(width, 255 * 256));
         }
 
         File excelFileTemp = null;

+ 6 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/SyncBasicExamStudentImportService.java

@@ -122,6 +122,7 @@ public class SyncBasicExamStudentImportService extends SyncImportTaskTemplate {
                     FINISH_TOTAL_SIZE, successCount, FINISH_SUCCESS_SIZE, errorCount, FINISH_ERROR_SIZE));
             if (CollectionUtils.isNotEmpty(errorDataList)) {
                 tbTask.setResult(TaskResultEnum.ERROR);
+                String createExcelError = "";
                 try {
                     File excelFileTemp = SystemConstant.getFileTempVar(SystemConstant.EXCEL_PREFIX);
                     this.createLocalErrorExcel(errorDataList, excelFileTemp);
@@ -129,9 +130,10 @@ public class SyncBasicExamStudentImportService extends SyncImportTaskTemplate {
                     FilePathVo filePathVo = fileUploadService.uploadFile(excelFileTemp, UploadFileEnum.FILE, fileName);
                     tbTask.setErrorFilePath(JSON.toJSONString(filePathVo));
                 } catch (Exception e) {
-                    log.error("创建考生字典导入错误数据文件失败");
+                    createExcelError = e.getMessage();
+                    log.error("创建考生字典导入错误数据文件失败: " + e.getMessage());
                 } finally {
-                    tbTask.setSummary("创建考生字典导入错误数据文件失败" + stringJoinerSummary);
+                    tbTask.setSummary("创建考生字典导入错误数据文件失败" + stringJoinerSummary + createExcelError);
                 }
             } else {
                 tbTask.setSummary(stringJoinerSummary.toString());
@@ -234,7 +236,8 @@ public class SyncBasicExamStudentImportService extends SyncImportTaskTemplate {
         }
         for (int i = 0; i < cellCount; i++) {
             sheet.autoSizeColumn(i);
-            sheet.setColumnWidth(i, sheet.getColumnWidth(i) * 17 / 10);
+            int width = sheet.getColumnWidth(i)  * 17 / 10;
+            sheet.setColumnWidth(i, Math.min(width, 255 * 256));
         }
 
         FileOutputStream outputStream = new FileOutputStream(excelFileTemp);