修改：【重点帮扶】导入：增加报错信息导出的模板

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) {

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java

@@ -47,13 +47,14 @@ public class LingShanSpecialCrowdYesOrNoConverter implements Converter<Integer>
     public WriteCellData<?> convertToExcelData(WriteConverterContext<Integer> 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) {

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;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanHelpCrowdExcelImportListener.java

@@ -292,7 +292,9 @@ public abstract class AbstractLingShanHelpCrowdExcelImportListener<T extends Lin
         }
 
         // 保存人群详情数据
-        saveBatchCallback(correctDatas);
+        if (CollectionUtils.isNotEmpty(correctDatas)) {
+            saveBatchCallback(correctDatas);
+        }
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdCanjiExcelImportListener.java

@@ -26,7 +26,7 @@ public class LingShanHelpCrowdCanjiExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_canji_export.xlsx";
+        return "excel/lingshan/help_crowd_export_canji.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdDabingExcelImportListener.java

@@ -28,7 +28,7 @@ public class LingShanHelpCrowdDabingExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_dabing_export.xlsx";
+        return "excel/lingshan/help_crowd_export_dabing.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdDibaoExcelImportListener.java

@@ -30,7 +30,7 @@ public class LingShanHelpCrowdDibaoExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_dibao_export.xlsx";
+        return "excel/lingshan/help_crowd_export_dibao.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdDujuExcelImportListener.java

@@ -27,7 +27,7 @@ public class LingShanHelpCrowdDujuExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_duju_export.xlsx";
+        return "excel/lingshan/help_crowd_export_duju.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdGaolingExcelImportListener.java

@@ -27,7 +27,7 @@ public class LingShanHelpCrowdGaolingExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_gaoling_export.xlsx";
+        return "excel/lingshan/help_crowd_export_gaoling.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdKongchaoExcelImportListener.java

@@ -27,7 +27,7 @@ public class LingShanHelpCrowdKongchaoExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_kongchao_export.xlsx";
+        return "excel/lingshan/help_crowd_export_kongchao.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdLiushouExcelImportListener.java

@@ -27,7 +27,7 @@ public class LingShanHelpCrowdLiushouExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_liushou_export.xlsx";
+        return "excel/lingshan/help_crowd_export_liushou.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/LingShanHelpCrowdTekunExcelImportListener.java

@@ -29,7 +29,7 @@ public class LingShanHelpCrowdTekunExcelImportListener
 
     @Override
     String setTemplateFileName() {
-        return "excel/lingshan/lingshan_help_crowd_tekun_export.xlsx";
+        return "excel/lingshan/help_crowd_export_tekun.xlsx";
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanHelpCrowdServiceImpl.java

@@ -249,7 +249,7 @@ public class LingShanHelpCrowdServiceImpl implements LingShanHelpCrowdService, R
 
         // 创建导入任务
         ImportTaskCommonResultDTO importTaskRst = getResultDataOrThrowsException(ImportTaskUtils.createImportTask(originalFilename,
-                        BizTypeEnum.SPECIAL_CROWD.getType()),
+                        BizTypeEnum.HELP_CROWD.getType()),
                 ServiceConstant.EPMET_COMMON_SERVICE,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                 null, "【灵山街道-导入重点帮扶人群】创建导入任务失败");
@@ -261,7 +261,7 @@ public class LingShanHelpCrowdServiceImpl implements LingShanHelpCrowdService, R
             // 如果提交异步任务失败了，也要将导入任务置为结束,并且返回一个未知错误
             log.error("【灵山街道-导入重点帮扶人群】失败，错误信息:" + ExceptionUtils.getErrorStackTrace(e));
             ImportTaskUtils.finishImportTask(importTaskRst.getTaskId(),
-                    ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "未知错误");
+                    ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "未知错误，创建异步任务失败", 0, 0);
 
             // 删除文件
             FileUtils.deleteFileIfExists(fileSavePath);
@@ -288,7 +288,7 @@ public class LingShanHelpCrowdServiceImpl implements LingShanHelpCrowdService, R
                         .sheet(0)
                         .doRead();
 
-                List<LingShanSpecialCrowdDetailBaseExcelData> 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);
             }