Commit 2ce70bce authored by huyuchen's avatar huyuchen

huych-户配置调整

parent ce0641c0
......@@ -459,6 +459,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
SysHouseHoldInfo info;
SysUser auditUser;
SysUser handlerUser;
String errorMsg;
// 个性化校验逻辑
// 执行数据插入操作组装
for (int i = 0; i < excelVOList.size(); i++) {
......@@ -524,11 +525,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue;
}
//校验手机号准确性
// errorMsg = checkMobile(String.valueOf(excel.getPhone()));
// if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
// errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg,excel));
// continue;
// }
errorMsg = checkMobile(excel.getPhone());
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg,excel));
continue;
}
//封装和插入数据
household.setAreaCode(areaMap.get(household.getCity()).getAreaCode());
household.setAutoStatus(excel.getAutoStatus().equals(CommonConstants.IS_TRUE) ? "0" : "1");
......@@ -580,6 +581,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
Map<String,String> exitNameMap = new HashMap<>();
SysHouseHoldInfo info;
String errorMsg;
// 个性化校验逻辑
// 执行数据插入操作 组装
for (int i = 0; i < excelVOList.size(); i++) {
......@@ -663,13 +665,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
//校验手机号准确性
// if (Common.isNotNull(excel.getPhone())) {
// errorMsg = checkMobile(String.valueOf(excel.getPhone()));
// if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
// errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
// continue;
// }
// }
if (Common.isNotNull(excel.getPhone())) {
errorMsg = checkMobile(excel.getPhone());
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
continue;
}
}
// 新老数据审核人办理人不同,先删除,再添加
if (Common.isNotNull(excel.getAuditUserName()) && !excel.getAuditUserName().equals(info.getAuditUserName())) {
tSocialfundHouseResService.deleteAuditUser(info);
......@@ -720,7 +722,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info.setOrganName(excel.getOrganName());
}
if (Common.isNotNull(excel.getPhone())) {
info.setPhone(String.valueOf(excel.getPhone()));
info.setPhone(excel.getPhone());
}
if (Common.isNotNull(excel.getCustomerNo())) {
info.setCustomerNo(excel.getCustomerNo());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment