|
@@ -73,7 +73,10 @@ public class EquDieseloilUseManagementServiceImpl extends ServiceImpl<EquDieselo
|
|
|
LambdaQueryWrapper<EquDieseloilUseManagementDo> queryWrapper = setqueryWrapper(dieseloilUseManagementDoList,tenantid);
|
|
|
List<EquDieseloilUseManagementDo> oldList = equDieseloilUseManagementDao.selectList(queryWrapper);
|
|
|
|
|
|
- List<String> dieseldates = oldList.stream().map(info ->DateUtil.format(info.getDieseldate(),DATE_PATTERN_YMD) ).collect(Collectors.toList());
|
|
|
+ List<String> dieseldates = oldList.stream().map(info ->DateUtil.format(info.getDieseldate(),DATE_PATTERN_YMD) ).distinct().collect(Collectors.toList());
|
|
|
+ if (dieseldates.size()<oldList.size()){
|
|
|
+ return R.error("上传文件内存在重复的日期,请检查");
|
|
|
+ }
|
|
|
|
|
|
//通过时间判断是否有相同的数据
|
|
|
for (EquDieseloilUseManagementDo dieseloilUseManagementDo:dieseloilUseManagementDoList){
|