|
@@ -22,6 +22,7 @@ import org.springframework.util.StringUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.math.RoundingMode;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -199,7 +200,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
public Boolean remove(Long obeCultureProgramId, Long courseId, String paperNumber) {
|
|
public Boolean remove(Long obeCultureProgramId, Long courseId, String paperNumber) {
|
|
- TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(obeCultureProgramId,courseId,paperNumber);
|
|
|
|
|
|
+ TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(obeCultureProgramId, courseId, paperNumber);
|
|
return Objects.nonNull(trBasicInfo) ? trExamStudentService.remove(trBasicInfo.getId()) : false;
|
|
return Objects.nonNull(trBasicInfo) ? trExamStudentService.remove(trBasicInfo.getId()) : false;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -263,7 +264,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
|
|
StudentTotalRequirement studentTotalRequirement = new StudentTotalRequirement();
|
|
StudentTotalRequirement studentTotalRequirement = new StudentTotalRequirement();
|
|
studentTotalRequirement.setRequirementName(keys[1]);
|
|
studentTotalRequirement.setRequirementName(keys[1]);
|
|
studentTotalRequirement.setRequirementSortNum(Integer.valueOf(keys[0]));
|
|
studentTotalRequirement.setRequirementSortNum(Integer.valueOf(keys[0]));
|
|
- studentTotalRequirement.setStudentDegree(doubleMap.values().stream().min(Double::compare).get());
|
|
|
|
|
|
+ studentTotalRequirement.setStudentDegree(new BigDecimal(doubleMap.values().stream().min(Double::compare).get()).setScale(2, RoundingMode.HALF_UP).doubleValue());
|
|
if (requirementDegreeMap.containsKey(keys[1])) {
|
|
if (requirementDegreeMap.containsKey(keys[1])) {
|
|
studentTotalRequirement.setProfessionalDegree(requirementDegreeMap.get(keys[1]).doubleValue());
|
|
studentTotalRequirement.setProfessionalDegree(requirementDegreeMap.get(keys[1]).doubleValue());
|
|
}
|
|
}
|