diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java index 517330e427..22b6305c64 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java @@ -20,6 +20,7 @@ public enum BizTypeEnum { PROJECT("project", "项目"), ARTICLE("article", "文章(党建声音)"), SPECIAL_CROWD("special_crowd", "社会维稳(特殊人群)"), + HELP_CROWD("help_crowd", "重点帮扶人群"), ; public static BizTypeEnum getEnum(String code) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java index 1f9281d224..86f6c403bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java @@ -47,13 +47,14 @@ public class LingShanSpecialCrowdYesOrNoConverter implements Converter public WriteCellData convertToExcelData(WriteConverterContext context) throws Exception { String fieldName = context.getContentProperty().getField().getName(); Integer value = context.getValue(); - if (group1.contains(fieldName)) { - return convertYesOrNoFlag(value); - } else if (group2.contains(fieldName)) { + + // 这个组里的,要转化为有无 + if (group2.contains(fieldName)) { return convertHaveOrNotFlag(value); } - return Converter.super.convertToExcelData(context); + // 其他的都转化为是否 + return convertYesOrNoFlag(value); } WriteCellData convertHaveOrNotFlag(Integer value) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java index 617e7cd879..96a912d998 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanHelpCrowdBaseExcelData.java @@ -27,7 +27,7 @@ public class LingShanHelpCrowdBaseExcelData { /** * 错误信息 */ - @ExcelProperty(value = "错误信息") + @ExcelProperty(value = "说明") private String errorInfo; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java index 0ea1f100f3..547d12001b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java @@ -292,7 +292,9 @@ public abstract class AbstractLingShanHelpCrowdExcelImportListener errorDatas = listener.getErrorDatas(); + List errorDatas = listener.getErrorDatas(); if (CollectionUtils.isNotEmpty(errorDatas)) { // 有错误数据需要提示 String resultDescFilePath = uploadResultDescFilePath(errorDatas, listener.getTemplateFileName()); @@ -301,9 +301,9 @@ public class LingShanHelpCrowdServiceImpl implements LingShanHelpCrowdService, R ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, null, "成功", listener.getSuccessedItemsQty(), listener.getFailedItemsQty()); } } catch (Exception e) { - log.error("【灵山街道-导入重点帮扶人群】失败,错误信息:" + ExceptionUtils.getErrorStackTrace(e)); + log.error("【灵山街道-导入重点帮扶人群】异步任务过程中失败,错误信息:" + ExceptionUtils.getErrorStackTrace(e)); ImportTaskUtils.finishImportTask(taskId, - ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "未知错误"); + ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "未知错误,异步任务过程中失败", 0, 0); } finally { FileUtils.deleteFileIfExists(fileSavePath); } diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_canji.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_canji.xlsx new file mode 100644 index 0000000000..f492338dd2 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_canji.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dabing.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dabing.xlsx new file mode 100644 index 0000000000..15dc41f88d Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dabing.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dibao.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dibao.xlsx new file mode 100644 index 0000000000..dac7195b6a Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_dibao.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_duju.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_duju.xlsx new file mode 100644 index 0000000000..e038a97576 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_duju.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_gaoling.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_gaoling.xlsx new file mode 100644 index 0000000000..914f0b8603 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_gaoling.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_kongchao.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_kongchao.xlsx new file mode 100644 index 0000000000..a2b8f0bf1b Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_kongchao.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_liushou.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_liushou.xlsx new file mode 100644 index 0000000000..5a28da8135 Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_liushou.xlsx differ diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_tekun.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_tekun.xlsx new file mode 100644 index 0000000000..0f80abd7ce Binary files /dev/null and b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/help_crowd_export_tekun.xlsx differ