|
@@ -178,7 +178,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
|
|
// 计算进度
|
|
// 计算进度
|
|
BigDecimal progress = BigDecimal.ZERO;
|
|
BigDecimal progress = BigDecimal.ZERO;
|
|
int checkCount = vo.getCheckCount();
|
|
int checkCount = vo.getCheckCount();
|
|
- if (checkCount > 0){
|
|
|
|
|
|
+ if (checkCount > 0) {
|
|
progress = new BigDecimal(vo.getCheckNormalLCount()).divide(new BigDecimal(checkCount), 4, RoundingMode.HALF_UP);
|
|
progress = new BigDecimal(vo.getCheckNormalLCount()).divide(new BigDecimal(checkCount), 4, RoundingMode.HALF_UP);
|
|
progress = progress.multiply(new BigDecimal(100));
|
|
progress = progress.multiply(new BigDecimal(100));
|
|
}
|
|
}
|
|
@@ -208,7 +208,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
|
|
Year year = Year.now();
|
|
Year year = Year.now();
|
|
String examName = (Long.parseLong(year.toString()) + 1) + schoolName;
|
|
String examName = (Long.parseLong(year.toString()) + 1) + schoolName;
|
|
if (examNameDatasource.contains(examName)) {
|
|
if (examNameDatasource.contains(examName)) {
|
|
- throw new StatusException(String.format("第[%s]行已有学校名称则,导入不成功", examName));
|
|
|
|
|
|
+ throw new StatusException(String.format("导入不成功,已有学校名称则[%s]", examName));
|
|
}
|
|
}
|
|
ExamEntity examEntity = new ExamEntity();
|
|
ExamEntity examEntity = new ExamEntity();
|
|
examEntity.setOrgId(defaultOrg.getId());
|
|
examEntity.setOrgId(defaultOrg.getId());
|
|
@@ -260,8 +260,8 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
|
|
/**
|
|
/**
|
|
* 拼接导入异常信息
|
|
* 拼接导入异常信息
|
|
*
|
|
*
|
|
- * @param excelErrors
|
|
|
|
- * @return
|
|
|
|
|
|
+ * @param excelErrors 异常信息
|
|
|
|
+ * @return 异常返回结果
|
|
*/
|
|
*/
|
|
private String errorsString(List<ExcelError> excelErrors) {
|
|
private String errorsString(List<ExcelError> excelErrors) {
|
|
StringJoiner sj = new StringJoiner(";");
|
|
StringJoiner sj = new StringJoiner(";");
|
|
@@ -269,9 +269,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
|
|
int forint = excelErrors.size() < 10 ? excelErrors.size() : 9;
|
|
int forint = excelErrors.size() < 10 ? excelErrors.size() : 9;
|
|
for (int i = 0; i < forint; i++) {
|
|
for (int i = 0; i < forint; i++) {
|
|
ExcelError excelError = excelErrors.get(i);
|
|
ExcelError excelError = excelErrors.get(i);
|
|
- StringBuffer sb = new StringBuffer();
|
|
|
|
- sb.append("第").append(excelError.getRow()).append("行,").append(excelError.getExcelErrorType());
|
|
|
|
- sj.add(sb.toString());
|
|
|
|
|
|
+ sj.add("第" + excelError.getRow() + "行," + excelError.getExcelErrorType());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return sj.toString();
|
|
return sj.toString();
|