|
@@ -2713,11 +2713,25 @@ public class WmScorePackageController {
|
|
|
// 重复的模型
|
|
|
Map<String, List<BatchPackageExcelModel>> dupNameModel = batchPackageExcelModels.stream()
|
|
|
.collect(Collectors.groupingBy(BatchPackageExcelModel::getScorePackageName));
|
|
|
+ List<String> names = batchPackageExcelModels.stream().map(BatchPackageExcelModel::getScorePackageName).collect(Collectors.toList());
|
|
|
|
|
|
for (Map.Entry<String, List<BatchPackageExcelModel>> entry : dupNameModel.entrySet()){
|
|
|
String name = entry.getKey();
|
|
|
- if (entry.getValue().size() > 1){
|
|
|
- errorMap.put("模板内积分包名称重复", name);
|
|
|
+ int size = entry.getValue().size();
|
|
|
+ if (size > 1){
|
|
|
+ List<Integer> index = new ArrayList<>(size);
|
|
|
+ List<String> temp = new ArrayList<>(names);
|
|
|
+ Iterator<String> iterator = names.iterator();
|
|
|
+ while (iterator.hasNext()){
|
|
|
+ int idx = temp.lastIndexOf(name);
|
|
|
+ if(idx != -1){
|
|
|
+ index.add(idx + 1);
|
|
|
+ temp.remove(idx);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ errorMap.put("模板内积分包名称重复", index);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2843,6 +2857,14 @@ public class WmScorePackageController {
|
|
|
model.setTargetId(String.valueOf(target.get(0).getUserId()));
|
|
|
}
|
|
|
}
|
|
|
+ // 兼职校验
|
|
|
+ else {
|
|
|
+ // 校验名称是否为空
|
|
|
+ log.info("MOBILE: [{}], NAME: [{}]", model.getTargetName(), model.getTargetName());
|
|
|
+ if (StrUtil.isNotEmpty(model.getTargetName()) || StrUtil.isNotEmpty(model.getMobile())) {
|
|
|
+ errorMap.put("请勿使用全职模板", row);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
log.warn("==========================================校验批量下发积分包model:开始=====================================================");
|