|
@@ -56,7 +56,7 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
|
|
|
|
|
|
@Transactional
|
|
|
@Override
|
|
|
- public MarkUserClassDto updateOpenMarkClassByExamIdAndPaperNumber(Long examId, String paperNumber, Boolean classMark) {
|
|
|
+ public void updateOpenMarkClassByExamIdAndPaperNumber(Long examId, String paperNumber, Boolean classMark) {
|
|
|
UpdateWrapper<MarkPaper> updateWrapper = new UpdateWrapper<>();
|
|
|
updateWrapper.lambda().set(MarkPaper::getClassMark, classMark)
|
|
|
.eq(MarkPaper::getExamId, examId)
|
|
@@ -72,7 +72,18 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
|
|
|
this.deleteByExamIdAndPaperNumber(examId, paperNumber);
|
|
|
}
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void deleteByExamIdAndPaperNumber(Long examId, String paperNumber) {
|
|
|
+ UpdateWrapper<MarkUserClass> updateWrapper = new UpdateWrapper<>();
|
|
|
+ updateWrapper.lambda().eq(MarkUserClass::getExamId, examId)
|
|
|
+ .eq(MarkUserClass::getPaperNumber, paperNumber);
|
|
|
+ this.remove(updateWrapper);
|
|
|
+ }
|
|
|
|
|
|
+ @Override
|
|
|
+ public MarkUserClassDto listMarkUserClassByExamIdAndPaperNumber(Long examId, String paperNumber) {
|
|
|
// 课程下所有班级数据
|
|
|
List<String> paperNumberClassList = markStudentService.listClassByExamIdAndCourseCode(examId, paperNumber);
|
|
|
List<MarkUser> markUserList = markUserQuestionService.listGroupUserByExamIdAndPaperNumberAndQuestionIdAndClassName(examId, paperNumber, null, null);
|
|
@@ -95,38 +106,6 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
|
|
|
return markUserClassDto;
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public void deleteByExamIdAndPaperNumber(Long examId, String paperNumber) {
|
|
|
- UpdateWrapper<MarkUserClass> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.lambda().eq(MarkUserClass::getExamId, examId)
|
|
|
- .eq(MarkUserClass::getPaperNumber, paperNumber);
|
|
|
- this.remove(updateWrapper);
|
|
|
- }
|
|
|
-
|
|
|
-// @Override
|
|
|
-// public MarkUserClassDto listMarkUserClassByExamIdAndPaperNumber(Long examId, String paperNumber) {
|
|
|
-// // 课程下所有班级数据
|
|
|
-// List<String> paperNumberClassList = markStudentService.listClassByExamIdAndCourseCode(examId, paperNumber);
|
|
|
-// List<MarkUser> markUserList = markUserGroupService.listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, null, null);
|
|
|
-//
|
|
|
-// MarkUserClassDto markUserClassDto = new MarkUserClassDto();
|
|
|
-// markUserClassDto.setClassNames(paperNumberClassList);
|
|
|
-//
|
|
|
-// List<MarkUserClassDetailDto> markUserClassDetailDtos = new ArrayList<>();
|
|
|
-// for (MarkUser marker : markUserList) {
|
|
|
-// MarkUserClassDetailDto markUserClassDetailDto = new MarkUserClassDetailDto();
|
|
|
-// markUserClassDetailDto.setMarker(marker);
|
|
|
-// List<MarkUserClass> markUserClasses = this.baseMapper.listMarkerClassByExamIdAndPaperNumberAndUserId(examId, paperNumber, marker.getUserId());
|
|
|
-// // 剔除掉已经更名的班级
|
|
|
-// List<String> markUserClassSelectList = markUserClasses.stream().map(MarkUserClass::getClassName).collect(Collectors.toList());
|
|
|
-// List<String> intersectionList = (List<String>) CollectionUtils.intersection(paperNumberClassList, markUserClassSelectList);
|
|
|
-// markUserClassDetailDto.setMarkerClassList(intersectionList);
|
|
|
-// markUserClassDetailDtos.add(markUserClassDetailDto);
|
|
|
-// }
|
|
|
-// markUserClassDto.setMarkerClass(markUserClassDetailDtos);
|
|
|
-// return markUserClassDto;
|
|
|
-// }
|
|
|
-
|
|
|
@Override
|
|
|
public List<MarkUser> listClassMarkerByExamIdAndPaperNumberAndQuestionIdAndClassName(Long examId, String paperNumber, Long questionId, String className) {
|
|
|
return this.baseMapper.listClassMarkerByExamIdAndPaperNumberAndQuestionIdAndClassName(examId, paperNumber, questionId, className);
|
|
@@ -145,7 +124,7 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
|
|
|
for (MarkQuestion markQuestion : markQuestionList) {
|
|
|
Set<String> groupBindClassSet = new HashSet<>();
|
|
|
List<MarkUserQuestion> markUserQuestionList = markUserQuestionService.listByExamIdAndPaperNumberAndQuestionId(examId, paperNumber, markQuestion.getId());
|
|
|
- for (MarkGroupClassUserParams groupUserClassInfo : markClassUserParams.getGroupMarkerClass()) {
|
|
|
+ for (MarkGroupClassUserParams groupUserClassInfo : markClassUserParams.getQuestionMarkerClass()) {
|
|
|
if (markUserQuestionList.stream().filter(m -> m.getUserId().equals(groupUserClassInfo.getMarker().getUserId())).count() > 0) {
|
|
|
groupBindClassSet.addAll(groupUserClassInfo.getMarkerClassList());
|
|
|
}
|
|
@@ -159,7 +138,7 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
|
|
|
}
|
|
|
|
|
|
List<MarkUserClass> markUserClasses = new ArrayList<>();
|
|
|
- for (MarkGroupClassUserParams groupUserClassInfo : markClassUserParams.getGroupMarkerClass()) {
|
|
|
+ for (MarkGroupClassUserParams groupUserClassInfo : markClassUserParams.getQuestionMarkerClass()) {
|
|
|
for (String className : groupUserClassInfo.getMarkerClassList()) {
|
|
|
MarkUserClass markUserClass = new MarkUserClass();
|
|
|
markUserClass.setId(SystemConstant.getDbUuid());
|