rxswin导入验证
This commit is contained in:
+4
@@ -105,4 +105,8 @@ public class ProjectRxswinEO implements Serializable {
|
||||
@ApiModelProperty(value = "排序")
|
||||
private java.lang.String orderBy;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "行号")
|
||||
private java.lang.Integer number;
|
||||
|
||||
}
|
||||
|
||||
+28
-4
@@ -713,17 +713,41 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
|
||||
}
|
||||
|
||||
private void dataVerify(String cut, String projectId, List<ProjectRxswinEO> projectRxswinEOList, List<String> serialNumberList, List<String> msgList) {
|
||||
List<ProjectRxswinEO> projectRxswinEOListTemp = projectRxswinEOList;
|
||||
int number = 2;
|
||||
int numberTemp = 2;
|
||||
for (ProjectRxswinEO rxswinEO : projectRxswinEOListTemp) {
|
||||
rxswinEO.setNumber(number);
|
||||
number++;
|
||||
}
|
||||
for (ProjectRxswinEO projectRxswinEO : projectRxswinEOList) {
|
||||
projectRxswinEO.setNumber(numberTemp);
|
||||
numberTemp++;
|
||||
}
|
||||
int count = 2;
|
||||
for (ProjectRxswinEO projectRxswinEO : projectRxswinEOList) {
|
||||
int countError = 0;
|
||||
StringBuilder errorMsg = new StringBuilder();
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
errorMsg.append("第" + count + "行:");
|
||||
// errorMsg = "第" + count + "行:";
|
||||
} else {
|
||||
errorMsg.append(count + " line:");
|
||||
// errorMsg = count + " line:";
|
||||
}
|
||||
int countError = 0;
|
||||
List<ProjectRxswinEO> rxswinEOS = projectRxswinEOListTemp.stream()
|
||||
.filter(e -> !e.getNumber().equals(projectRxswinEO.getNumber()) && e.getTheme().equals(projectRxswinEO.getTheme()))
|
||||
.collect(Collectors.toList());
|
||||
if(!rxswinEOS.isEmpty()){
|
||||
List<Integer> numberList = rxswinEOS.stream().map(ProjectRxswinEO::getNumber).collect(Collectors.toList());
|
||||
if(CutEnum.CN.getValue().equals(cut)){
|
||||
errorMsg.append(RxswinEnum.TWO.getNameCn()+"与"+StringUtils.join(numberList,",")+"行主题重复,");
|
||||
}else{
|
||||
errorMsg.append(RxswinEnum.TWO.getNameEn()+" and "+StringUtils.join(numberList,",")+" are duplicated,");
|
||||
}
|
||||
|
||||
countError ++;
|
||||
}
|
||||
projectRxswinEOListTemp = projectRxswinEOListTemp.stream().filter(e->!e.getTheme().equals(projectRxswinEO.getTheme())).collect(Collectors.toList());
|
||||
|
||||
String serialNumber = projectRxswinEO.getSerialNumber();
|
||||
String theme = projectRxswinEO.getTheme();
|
||||
String rxswin = projectRxswinEO.getRxswin();
|
||||
@@ -763,7 +787,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
|
||||
countError = isMust(errorMsg, RxswinEnum.TWO.getNameEn(), theme, " cannot be empty,", countError);
|
||||
//验证主题是否存在
|
||||
if (!rxswinEOList.isEmpty()) {
|
||||
errorMsg.append(RxswinEnum.TWO.getNameCn() + " already exists,");
|
||||
errorMsg.append(RxswinEnum.TWO.getNameEn() + " already exists,");
|
||||
// errorMsg += RxswinEnum.TWO.getNameCn()+" already exists,";
|
||||
countError++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user