Commit 96dd0a9e authored by fangxinjiang's avatar fangxinjiang

代码优化-户修改&导入提示语-fxj

parent 7cc64d1a
...@@ -290,7 +290,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -290,7 +290,7 @@ public class ExcelUtil <T> implements Serializable {
if (Common.isNotNull(attr.readConverterExp())) { if (Common.isNotNull(attr.readConverterExp())) {
tempStr= reverseByExp( c, attr.readConverterExp()); tempStr= reverseByExp( c, attr.readConverterExp());
if (Common.isEmpty(tempStr)){ if (Common.isEmpty(tempStr)){
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"未找到:" + c + "的字典数据"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"列不可填写:" + c ), errorTemp);
continue; continue;
}else { }else {
c = tempStr; c = tempStr;
...@@ -313,15 +313,15 @@ public class ExcelUtil <T> implements Serializable { ...@@ -313,15 +313,15 @@ public class ExcelUtil <T> implements Serializable {
} }
if (StringUtils.isEmpty(tempStr) && (attr.isArea() || attr.isDataId())) { if (StringUtils.isEmpty(tempStr) && (attr.isArea() || attr.isDataId())) {
if (attr.isOrgan()) { if (attr.isOrgan()) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"未找到:" + c + "的单位或项目数据,请确认存在项目权限"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"未找到:" + c + "的单位或项目数据,请确认存在项目权限"), errorTemp);
} }
if (attr.isArea()) { if (attr.isArea()) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"未找到:" + c + "的区域数据"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"未找到:" + c + "的区域数据"), errorTemp);
} else { } else {
if (Common.isNotNull(attr.errorInfoImport())) { if (Common.isNotNull(attr.errorInfoImport())) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, "数据'" + c + "':" + attr.errorInfoImport()), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, "数据'" + c + "':" + attr.errorInfoImport()), errorTemp);
} else { } else {
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"未找到:" + c + "的字典数据"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, attr.name()+"列不可填写:" + c), errorTemp);
} }
} }
continue; continue;
...@@ -904,19 +904,19 @@ public class ExcelUtil <T> implements Serializable { ...@@ -904,19 +904,19 @@ public class ExcelUtil <T> implements Serializable {
} }
if (!StringUtils.isNotBlank(tempStr)) { if (!StringUtils.isNotBlank(tempStr)) {
if (attr.isOrgan()) { if (attr.isOrgan()) {
errorList.add(new ErrorMessage(i + 2, "未找到:" + c + "的单位或项目数据,请确认存在项目权限")); errorList.add(new ErrorMessage(i + 2, attr.name()+"列未找到:" + c + "的单位或项目数据,请确认存在项目权限"));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的单位或项目数据,请确认存在项目权限"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的单位或项目数据,请确认存在项目权限"), errorTemp);
} }
if (attr.isArea()) { if (attr.isArea()) {
errorList.add(new ErrorMessage(i + 2, "未找到:" + c + "的区域数据")); errorList.add(new ErrorMessage(i + 2, attr.name()+"列未找到:" + c + "的区域数据"));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的区域数据"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的区域数据"), errorTemp);
} else { } else {
if (Common.isNotNull(attr.errorInfoImport())) { if (Common.isNotNull(attr.errorInfoImport())) {
errorList.add(new ErrorMessage(i + 2, "数据'" + c + "':" + attr.errorInfoImport())); errorList.add(new ErrorMessage(i + 2, "数据'" + c + "':" + attr.errorInfoImport()));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "数据'" + c + "':" + attr.errorInfoImport()), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "数据'" + c + "':" + attr.errorInfoImport()), errorTemp);
} else { } else {
errorList.add(new ErrorMessage(i + 2, "未找到:" + c + "的字典数据")); errorList.add(new ErrorMessage(i + 2, attr.name()+"列不可填写:" + c));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的字典数据"), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, attr.name()+"列不可填写:" + c + "的字典数据"), errorTemp);
} }
} }
continue; continue;
......
...@@ -506,6 +506,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -506,6 +506,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
sysHouseHoldInfoFailResService.removeById(hold.getId()); sysHouseHoldInfoFailResService.removeById(hold.getId());
} }
} }
//处理省市县空的情况
if (Common.isEmpty(hold.getProvince())){
hold.setProvince(CommonConstants.EMPTY_STRING);
}
if (Common.isEmpty(hold.getCity())){
hold.setCity(CommonConstants.EMPTY_STRING);
}
if (Common.isEmpty(hold.getTown())){
hold.setTown(CommonConstants.EMPTY_STRING);
}
int res = baseMapper.updateById(hold); int res = baseMapper.updateById(hold);
if (res >= 0){ if (res >= 0){
//设置不记录更新日志字段 //设置不记录更新日志字段
......
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