From f8f28b8e70c6fb4e27f6f751f8548af585c3b79c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 7 Jul 2022 11:22:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=91=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=B8=80=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index e854bb493d..a7225b9816 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -111,6 +111,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * 身份证号列序号 */ public static final Integer ID_CARD_COLUMN_NO = 8; + /** + * 手机号列序号 + */ + public static final Integer MOBILE_COLUMN_NO = 7; /** * 姓名列序号 */ @@ -235,6 +239,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res @Excel(name = "姓名", width = 25) private String name; + @Excel(name = "手机号", width = 20) + private String mobile; + @Excel(name = "错误信息", width = 40) private String errorInfo; } @@ -286,6 +293,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res ErrorRow errorRow = new ErrorRow(); errorRow.setName("*"); errorRow.setIdCard("*"); + errorRow.setMobile("*"); errorRows.get().get(sheet.getTableName()).add(errorRow); } } @@ -574,6 +582,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res ErrorRow errorRow = new ErrorRow(); errorRow.setIdCard(columnAndValues.get("ID_CARD")); errorRow.setName(columnAndValues.get("NAME")); + errorRow.setMobile(columnAndValues.get("MOBILE")); errorRow.setErrorInfo(errorMsg); errorRow.setTableName(tableName); errorRows.get().get(IcResiUserTableEnum.IC_RESI_USER.getTableName()).add(errorRow); @@ -756,6 +765,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res ErrorRow errorRow = new ErrorRow(); errorRow.setName(columnAndValues.get("NAME")); errorRow.setIdCard(columnAndValues.get("ID_CARD")); + errorRow.setMobile(columnAndValues.get("MOBILE")); errorRow.setErrorInfo(errorMsg); errorRow.setTableName(targetTableName); errorRows.get().get(targetTableName).add(errorRow); @@ -784,6 +794,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ public void singlePersistResiVirtualSheetExtraInfo(Map columnAndValues, IcResiUserTableEnum sheetEnumObject) { String idCard = columnAndValues.get(ID_CARD_COLUMN_NO); + String name = columnAndValues.get(ID_NAME_COLUMN_NO); + String mobile = columnAndValues.get(MOBILE_COLUMN_NO); try { if (StringUtils.isBlank(idCard)) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), @@ -813,8 +825,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } ErrorRow errorRow = new ErrorRow(); - errorRow.setName(columnAndValues.get("NAME")); + errorRow.setName(name); errorRow.setIdCard(idCard); + errorRow.setMobile(mobile); errorRow.setErrorInfo(errorMsg); errorRow.setTableName(sheetEnumObject.getTableName()); errorRows.get().get(sheetEnumObject.getTableName()).add(errorRow); @@ -927,6 +940,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // 这两列要提前放进去，因为有的列未填写的话，会抛异常出去，需要用这两列来做描述 target2Insert.put("ID_CARD", row.get(ID_CARD_COLUMN_NO)); target2Insert.put("NAME", row.get(ID_NAME_COLUMN_NO)); + target2Insert.put("MOBILE", row.get(MOBILE_COLUMN_NO)); for (Map.Entry dbColumnMetadata : dbMetadataItemIdAndColumnWrappers.entrySet()) {