|
|
@@ -114,18 +114,23 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
Date date =new Date();
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
- List<InputExcelRdDetails> relust= new ArrayList<>();
|
|
|
+ int count=0;
|
|
|
List<String>errors=new ArrayList<>();
|
|
|
for (InputExcelRdDetails in : list) {
|
|
|
- relust.add(in);
|
|
|
- }
|
|
|
- for (InputExcelRdDetails in : relust) {
|
|
|
- in.setStatus(1);
|
|
|
- in.setAid(aid);
|
|
|
- in.setCreateTime(date);
|
|
|
+ int i = rdDetailsMapper.selectByRDName(in.getRdName());
|
|
|
+ if (i==0){
|
|
|
+ in.setStatus(1);
|
|
|
+ in.setAid(aid);
|
|
|
+ in.setCreateTime(date);
|
|
|
+ count++;
|
|
|
+ rdDetailsMapper.insertSelective(in);
|
|
|
+ }else {
|
|
|
+ errors.add(String.format("名称[%s]导入失败,名称已存在!",in.getRdName()));
|
|
|
+ }
|
|
|
}
|
|
|
- if (relust.size()>0)insertBatch(relust);
|
|
|
- map.put("OK",relust.size());
|
|
|
+
|
|
|
+// if (relust.size()>0)insertBatch(relust);
|
|
|
+ map.put("OK",count);
|
|
|
map.put("ERROR",errors);
|
|
|
return map;
|
|
|
}
|