diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java index 15f59bc..eee6676 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java @@ -778,10 +778,13 @@ public class TeacherServiceImpl implements TeacherService { queryService.shutdown(); } + //试卷code + String paperCode = "Paper-%s"; + //List lessonRecords = lessonRecordRepository.getLessonsByConditions(String.format(PK.PK_LESSON_RECORD, teacherDto.getCode()), teacherDto.getStartTime(), teacherDto.getEndTime(), teacherDto.getSubjectId(),teacherDto.getTmdId(),teacherDto.getGrade(),teacherDto.getPeriodId()); if(teacherDto.getTmdId() != null) { //查询个人试卷 备注:若是后面影响速度,可以优化改代码 - int count = paperTeacherRepository.getPaperCount(String.format("Paper-%s", teacherDto.getTmdId())); + int count = paperTeacherRepository.getPaperCount(String.format(paperCode, teacherDto.getTmdId())); List sugVos = sugVoList.stream().filter(sugVo -> sugVo.getHabook().equals(teacherDto.getTmdId())).collect(Collectors.toList()); LinkedHashMap mapTeach = new LinkedHashMap<>(); int[] scores = new int[10]; @@ -827,7 +830,7 @@ public class TeacherServiceImpl implements TeacherService { }else if(teacherDto.getGradeName() != null) { //查询学校试卷 备注:若是后面影响速度,可以优化改代码 - int count = paperTeacherRepository.getPaperCount(String.format("Paper-%s", teacherDto.getCode())); + int count = paperTeacherRepository.getPaperCount(String.format(paperCode, teacherDto.getCode())); List teachers = new ArrayList<>(); for (TeacherGradeVo gradeVo : gradeList) { for(TeacherGradeVo.IdAndName gradeId : gradeVo.getGrade()) { @@ -875,7 +878,7 @@ public class TeacherServiceImpl implements TeacherService { return mapTeach; }else { //查询学校试卷 备注:若是后面影响速度,可以优化改代码 - int count = paperTeacherRepository.getPaperCount(String.format("Paper-%s", teacherDto.getCode())); + int count = paperTeacherRepository.getPaperCount(String.format(paperCode, teacherDto.getCode())); LinkedHashMap mapTeach = new LinkedHashMap<>(); int[] scores = new int[10]; for (SugVo sugVo : sugVoList) {