|
|
@ -449,7 +449,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res |
|
|
|
public void persistIcResiBaseInfo(Map<String, ColumnWrapper> itemIdAndColumnWrapper, List<Map<Integer, String>> dataRows, |
|
|
|
String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel, |
|
|
|
String currUserAgencyPids, String currentUserId, String tableName) { |
|
|
|
|
|
|
|
String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId(); |
|
|
|
// 遍历每一行,将行内容转化为
|
|
|
|
for (Map<Integer, String> row : dataRows) { |
|
|
|
|
|
|
@ -462,7 +462,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res |
|
|
|
//默认新增
|
|
|
|
columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus()); |
|
|
|
String idCard = columnAndValues.get("ID_CARD"); |
|
|
|
Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); |
|
|
|
Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null); |
|
|
|
|
|
|
|
if (existingResiMap == null) { |
|
|
|
// 新导入的居民,因为还没有读取子sheet,所以这些居民类别没有办法获取,先默认设置成0,后面读取子sheet的时候再更新
|
|
|
|