|
@@ -232,7 +232,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
|
|
public IPage<StudentScoreDetailDto> pageStudentScore(Long examId, String paperNumber, String college, String majorName, String teachClassName,
|
|
public IPage<StudentScoreDetailDto> pageStudentScore(Long examId, String paperNumber, String college, String majorName, String teachClassName,
|
|
String className, String teacher, Integer filter, String status, Boolean breach, Double startScore,
|
|
String className, String teacher, Integer filter, String status, Boolean breach, Double startScore,
|
|
Double endScore, Double subjectiveStartScore, Double subjectiveEndScore, Double objectiveStartScore, Double objectiveEndScore,
|
|
Double endScore, Double subjectiveStartScore, Double subjectiveEndScore, Double objectiveStartScore, Double objectiveEndScore,
|
|
- Double subScore, Integer objectiveScoreRateLt, String studentName, String studentCode,
|
|
|
|
|
|
+ Double subScore, Integer objectiveScoreRateLt, String studentName, String studentCode, String secretNumber,
|
|
String orderType, String orderField, Integer pageNumber, Integer pageSize) {
|
|
String orderType, String orderField, Integer pageNumber, Integer pageSize) {
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
if (startScore != null && endScore == null) {
|
|
if (startScore != null && endScore == null) {
|
|
@@ -258,7 +258,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
|
|
IPage<StudentScoreDetailDto> studentScoreDetailDtoIPage = this.baseMapper.pageStudentScore(page, examId,
|
|
IPage<StudentScoreDetailDto> studentScoreDetailDtoIPage = this.baseMapper.pageStudentScore(page, examId,
|
|
paperNumber, college, majorName, teachClassName, className, teacher, filter, status, breach, startScore, endScore,
|
|
paperNumber, college, majorName, teachClassName, className, teacher, filter, status, breach, startScore, endScore,
|
|
subjectiveStartScore, subjectiveEndScore, objectiveStartScore, objectiveEndScore, subScore,
|
|
subjectiveStartScore, subjectiveEndScore, objectiveStartScore, objectiveEndScore, subScore,
|
|
- objectiveScoreLt, studentName, studentCode, orderType, orderField, dpr);
|
|
|
|
|
|
+ objectiveScoreLt, studentName, studentCode,secretNumber, orderType, orderField, dpr);
|
|
for (StudentScoreDetailDto scoreDetailDto : studentScoreDetailDtoIPage.getRecords()) {
|
|
for (StudentScoreDetailDto scoreDetailDto : studentScoreDetailDtoIPage.getRecords()) {
|
|
// 原图
|
|
// 原图
|
|
scoreDetailDto.setSheetUrls(buildSheetUrls(scoreDetailDto.getStudentId()));
|
|
scoreDetailDto.setSheetUrls(buildSheetUrls(scoreDetailDto.getStudentId()));
|
|
@@ -324,7 +324,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
- public List<StudentScoreDetailDto> pageStudentScoreExport(Long examId, String paperNumber, String college, String majorName, String teachClassName, String className, String teacher, Integer filter, String status, Boolean breach, Double startScore, Double endScore, Double subjectiveStartScore, Double subjectiveEndScore, Double objectiveStartScore, Double objectiveEndScore, Double subScore, Integer objectiveScoreRateLt, String studentName, String studentCode, String orderType, String orderField) {
|
|
|
|
|
|
+ public List<StudentScoreDetailDto> pageStudentScoreExport(Long examId, String paperNumber, String college, String majorName, String teachClassName, String className, String teacher, Integer filter, String status, Boolean breach, Double startScore, Double endScore, Double subjectiveStartScore, Double subjectiveEndScore, Double objectiveStartScore, Double objectiveEndScore, Double subScore, Integer objectiveScoreRateLt, String studentName, String studentCode, String secretNumber, String orderType, String orderField) {
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
if (startScore != null && endScore == null) {
|
|
if (startScore != null && endScore == null) {
|
|
throw ExceptionResultEnum.ERROR.exception("请输入试卷总分结束分数值");
|
|
throw ExceptionResultEnum.ERROR.exception("请输入试卷总分结束分数值");
|
|
@@ -348,7 +348,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
|
|
List<StudentScoreDetailDto> studentScoreDetailDtoList = this.baseMapper.pageStudentScoreExport(examId,
|
|
List<StudentScoreDetailDto> studentScoreDetailDtoList = this.baseMapper.pageStudentScoreExport(examId,
|
|
paperNumber, college, majorName, teachClassName, className, teacher, filter, status, breach, startScore, endScore,
|
|
paperNumber, college, majorName, teachClassName, className, teacher, filter, status, breach, startScore, endScore,
|
|
subjectiveStartScore, subjectiveEndScore, objectiveStartScore, objectiveEndScore, subScore,
|
|
subjectiveStartScore, subjectiveEndScore, objectiveStartScore, objectiveEndScore, subScore,
|
|
- objectiveScoreLt, studentName, studentCode, orderType, orderField, dpr);
|
|
|
|
|
|
+ objectiveScoreLt, studentName, studentCode, secretNumber, orderType, orderField, dpr);
|
|
Set<StudentScoreDetailExportDto> studentScoreDetailExportDtoSet = new HashSet<>();
|
|
Set<StudentScoreDetailExportDto> studentScoreDetailExportDtoSet = new HashSet<>();
|
|
for (StudentScoreDetailDto scoreDetailDto : studentScoreDetailDtoList) {
|
|
for (StudentScoreDetailDto scoreDetailDto : studentScoreDetailDtoList) {
|
|
studentScoreDetailExportDtoSet.add(new StudentScoreDetailExportDto(scoreDetailDto));
|
|
studentScoreDetailExportDtoSet.add(new StudentScoreDetailExportDto(scoreDetailDto));
|