|
|
@@ -117,6 +117,7 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
int OkCount=0;
|
|
|
int RdCount=0;
|
|
|
+ int erCount=0;
|
|
|
List<String>errors=new ArrayList<>();
|
|
|
for (InputExcelRdDetails in : list) {
|
|
|
if (StringUtils.isNotEmpty(in.getRdName())){
|
|
|
@@ -131,12 +132,14 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
|
|
|
rdDetailsMapper.insertSelective(in);
|
|
|
}catch (Exception e ){
|
|
|
int errorsCount=RdCount+3;
|
|
|
- errors.add(String.format("数据第%s行,项目名称[%s]数据格式不正确,请核对后再上传。",errorsCount,in.getRdName()));
|
|
|
+ errors.add(String.format("数据第%s行,项目名称[%s]数据异常!",errorsCount,in.getRdName()));
|
|
|
OkCount--;
|
|
|
}
|
|
|
}else {
|
|
|
OkCount--;
|
|
|
- errors.add(String.format("名称[%s]导入失败,名称已存在!",in.getRdName()));
|
|
|
+ erCount++;
|
|
|
+ int errorsCount=RdCount+3;
|
|
|
+ errors.add(String.format("%s、数据第%s行,名称[%s]导入失败,名称已存在!",erCount,errorsCount,in.getRdName()));
|
|
|
}
|
|
|
}
|
|
|
}
|