测试报告

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

@@ -18,6 +18,7 @@ import com.qmth.distributed.print.business.bean.result.report.PaperStructResult;
 import com.qmth.distributed.print.business.bean.result.report.word.CourseReportBean;
 import com.qmth.distributed.print.business.bean.result.report.word.CourseTargetTableBean3;
 import com.qmth.distributed.print.business.bean.result.report.word.CourseTargetTableBean4;
+import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.entity.TCPaperStruct;
 import com.qmth.distributed.print.business.entity.TRBasicInfo;
 import com.qmth.distributed.print.business.entity.TRExamStudent;
@@ -76,6 +77,9 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
     @Resource
     CourseWeightService courseWeightService;
 
+    @Resource
+    ExamStudentService examStudentService;
+
     protected final static DecimalFormat df = new DecimalFormat("0.##");
     protected final static String tbBgColor = "F2F2F2";
     protected final static String tbPercentWidth = "100%";
@@ -344,11 +348,15 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         BasicSemester basicSemester = basicSemesterService.selectByExamId(markPaper.getExamId());
         Objects.requireNonNull(basicSemester, "未找到学期信息");
 
-        //TODO 有测试数据，待肖飞补充授课对象和任课老师数据
+        ExamStudent examStudent = examStudentService.getOne(new QueryWrapper<ExamStudent>().select(" GROUP_CONCAT(DISTINCT clazz_name) as clazzName ")
+                .eq("exam_id", markPaper.getExamId())
+                .eq("paper_number", markPaper.getPaperNumber()));
+        String teachingObject = Objects.nonNull(examStudent) ? examStudent.getClazzName() : null;
+        //TODO 有测试数据，待肖飞补充任课老师数据
         if (Objects.isNull(trBasicInfo)) {
-            trBasicInfo = new TRBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), "测试班级1", "测试老师1", 40, userId);
+            trBasicInfo = new TRBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, null, null, userId);
         } else {
-            trBasicInfo.setBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), "测试班级1", "测试老师1", 40);
+            trBasicInfo.setBasicInfo(markPaper.getExamId(), markPaper.getCourseCode(), markPaper.getCourseName(), markPaper.getPaperNumber(), basicSemester.getName(), teachingObject, "测试老师1", null);
         }
         //测试数据
         //课程基本情况

distributed-print-business/src/main/resources/mapper/TCFinalScoreMapper.xml

@@ -60,7 +60,7 @@
             tcfs.score as finalScore,
             tcfs.score_detail as finalScoreDetail,
             tcus.score as usualScore,
-            es.teach_clazz_name as administrativeClass
+            es.clazz_name as administrativeClass
         from t_c_final_score tcfs
         join t_c_usual_score tcus on tcfs.exam_id = tcus.exam_id and tcfs.course_code = tcus.course_code and tcfs.paper_number and tcus.paper_number and tcfs.student_code = tcus.student_code
         join exam_student es on es.exam_id = tcfs.exam_id and es.paper_number = tcfs.paper_number and es.student_code = tcfs.student_code