错误信息修改

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -259,7 +259,7 @@ public class StaffController implements ResultDataResolver {
 
 		Path fileSavePath;
 		try {
-			Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import");
+			Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import");
 			fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName));
 		} catch (IOException e) {
 			String errorMsg = ExceptionUtils.getErrorStackTrace(e);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java

@@ -60,6 +60,13 @@ public class CustomerStaffImportExcelData {
     @Data
     public static class RowRemarkMessage {
 
+        @ColumnWidth(60)
+        @ExcelProperty("姓名")
+        private String name;
+
+        @ColumnWidth(60)
+        @ExcelProperty("联系电话")
+        private String mobile;
 
         @ColumnWidth(60)
         @ExcelProperty("错误信息")

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java

@@ -38,6 +38,8 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
 
     private String currentOrgId;
 
+    private CustomerStaffImportExcelData dataB;
+
 
     /**
      * 数据
@@ -67,6 +69,8 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
     public void invoke(CustomerStaffImportExcelData data, AnalysisContext context) {
 
         try {
+
+            dataB = data;
             // 先校验数据
             ValidatorUtils.validateEntity(data);
 
@@ -144,6 +148,8 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
 
             CustomerStaffImportExcelData.RowRemarkMessage errorRow = new CustomerStaffImportExcelData.RowRemarkMessage();
             errorRow.setErrorInfo(errorMsg);
+            errorRow.setName(data.getName());
+            errorRow.setMobile(data.getMobile());
             errorRows.add(errorRow);
         }
     }
@@ -151,7 +157,25 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
         // 最后几条达不到阈值，这里必须再调用一次
-        execPersist();
+        try {
+            execPersist();
+        }catch (Exception e) {
+            String errorMsg = null;
+            if (e instanceof ValidateException) {
+                errorMsg = ((ValidateException) e).getMsg();
+            } else {
+                log.error("【客户信息导入】出错:{}", e.getStackTrace());
+                errorMsg = ((EpmetException)e).getInternalMsg();
+                log.error("【客户信息导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
+            }
+
+            CustomerStaffImportExcelData.RowRemarkMessage errorRow = new CustomerStaffImportExcelData.RowRemarkMessage();
+            errorRow.setErrorInfo(errorMsg);
+            errorRow.setName(dataB.getName());
+            errorRow.setMobile(dataB.getMobile());
+            errorRows.add(errorRow);
+        }
+
     }
 
     /**
@@ -163,7 +187,7 @@ public class CustomerStaffImportListener implements ReadListener<CustomerStaffIm
 //                icNatService.batchPersist(datas, this);
                 staffService.exportAdd(datas,this);
             }
-        } finally {
+        }finally {
             datas.clear();
         }
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -792,9 +792,9 @@ public class StaffServiceImpl implements StaffService {
 			if (errorRows.size() > 0) {
 				try {
 					// 文件生成
-					Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
+					Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import", "error_des");
 					String timeMillis = String.valueOf(System.currentTimeMillis());
-					String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx");
+					String fileName = "staff_import_error_".concat(timeMillis).concat(".xlsx");
 
 					fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile())
 							.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);