|
|
@ -389,11 +389,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res |
|
|
|
private void importIcResiBaseInfoFromExcel(List<FormItemResult> formItemList, String excelPathName, int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId, |
|
|
|
String tableName, String customerId) { |
|
|
|
|
|
|
|
String loginUserApp = EpmetRequestHolder.getHeader(AppClientConstant.APP); |
|
|
|
String loginUserClient = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT); |
|
|
|
String loginUserId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID.toLowerCase()); |
|
|
|
String loginUserCustomerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID.toLowerCase()); |
|
|
|
|
|
|
|
IcResiImportDynamicExcelListener readListener = new IcResiImportDynamicExcelListener(this, customerId, currentUserId, currUserAgencyId, currUserAgencyPids, |
|
|
|
true, tableName, formItemList, headRowNumber); |
|
|
|
EasyExcel.read(new File(excelPathName)).registerReadListener(readListener).headRowNumber(headRowNumber).sheet(sheetNo).doRead(); |
|
|
@ -750,6 +745,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res |
|
|
|
public void singlePersistResiVirtualSheetExtraInfo(Map<String, String> columnAndValues, IcResiUserTableEnum sheetEnumObject) { |
|
|
|
String idCard = columnAndValues.get(ID_CARD_COLUMN_NO); |
|
|
|
try { |
|
|
|
if (StringUtils.isBlank(idCard)) { |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), |
|
|
|
"身份证号未填写", |
|
|
|
"身份证号未填写"); |
|
|
|
} |
|
|
|
|
|
|
|
Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); |
|
|
|
|
|
|
|
if (resiInfoMap == null || resiInfoMap.size() == 0) { |
|
|
|