3.1.0-任课老师获取修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchServiceImpl.java

@@ -292,9 +292,11 @@ public class GradeBatchServiceImpl extends ServiceImpl<GradeBatchMapper, GradeBa
 
             XSSFCell cell6 = row.createCell(6);
             cell6.setCellStyle(unlockStyle);
+            cell6.setCellType(CellType.STRING);
 
             XSSFCell cell7 = row.createCell(7);
             cell7.setCellStyle(unlockStyle);
+            cell7.setCellType(CellType.STRING);
         }
 
         for (int i = 0; i < fieldsNameList.length; i++) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/OpenApiServiceImpl.java

@@ -52,6 +52,9 @@ public class OpenApiServiceImpl implements OpenApiService {
     @Resource
     private GradeBatchStudentService gradeBatchStudentService;
 
+    @Resource
+    private GradeBatchStudentClazzService gradeBatchStudentClazzService;
+
     @Override
     public PaperConfig getPaperConfig(BasicSchool basicSchool, String thirdExamId, String gradeCourseCode) {
         GradeBatchPaper gradeBatchPaper = gradeBatchPaperService.findByThirdExamIdAndGradeCourseCode(basicSchool.getId(), thirdExamId, gradeCourseCode);
@@ -154,9 +157,9 @@ public class OpenApiServiceImpl implements OpenApiService {
             return examStudentScoreList;
         }
 
-        QueryWrapper<GradeBatchStudent> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(GradeBatchStudent::getBatchId, gradeBatchPaper.getBatchId());
-        List<GradeBatchStudent> gradeBatchStudentList = gradeBatchStudentService.list(queryWrapper);
+        QueryWrapper<GradeBatchStudentClazz> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(GradeBatchStudentClazz::getBatchId, gradeBatchPaper.getBatchId());
+        List<GradeBatchStudentClazz> gradeBatchStudentClazzList = gradeBatchStudentClazzService.list(queryWrapper);
 
         QueryWrapper<TSyncExamStudentScore> examStudentScoreQueryWrapper = new QueryWrapper<>();
         String subjectCode = examTask.getCourseCode() + gradeBatchPaper.getPaperType() + examTask.getSequence();
@@ -176,9 +179,9 @@ public class OpenApiServiceImpl implements OpenApiService {
             BasicMajor basicMajor = basicMajorService.getById(m.getMajorId());
             examStudentScore.setMajor(basicMajor == null ? null : basicMajor.getName());
             examStudentScore.setClassName(m.getClazzName());
-            GradeBatchStudent gradeBatchStudent = gradeBatchStudentList.isEmpty() ? null : gradeBatchStudentList.stream().filter(s -> s.getStudentCode().equals(examStudentScore.getStudentCode()) && s.getPaperNumber().equals(examStudentScore.getPaperNumber()) && s.getPaperType().equals(examStudentScore.getPaperType())).findFirst().orElseGet(null);
-            examStudentScore.setTeacherName(gradeBatchStudent != null ? gradeBatchStudent.getTeacherName() : null);
-            examStudentScore.setTeacherCode(gradeBatchStudent != null ? gradeBatchStudent.getTeacherNumber() : null);
+            GradeBatchStudentClazz gradeBatchStudentClazz = gradeBatchStudentClazzList.isEmpty() ? null : gradeBatchStudentClazzList.stream().filter(s -> s.getClazzId().equals(m.getClazzId().toString()) && s.getPaperNumber().equals(examStudentScore.getPaperNumber()) && s.getPaperType().equals(examStudentScore.getPaperType())).findFirst().orElseGet(null);
+            examStudentScore.setTeacherName(gradeBatchStudentClazz != null ? gradeBatchStudentClazz.getTeacherName() : null);
+            examStudentScore.setTeacherCode(gradeBatchStudentClazz != null ? gradeBatchStudentClazz.getTeacherNumber() : null);
             examStudentScore.setStatus(m.getStatus());
             examStudentScore.setTotalScore(m.getTotalScore());
             examStudentScore.setObjectiveScore(m.getObjectiveScore());