3.3.1 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamStudent.java

@@ -99,6 +99,9 @@ public class ExamStudent extends BaseEntity implements Serializable {
     @TableField("teacher_id")
     private Long teacherId;
 
+    @TableField(exist = false)
+    private String teacherName;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "附件id")
     @TableField(value = "attachment_id")
@@ -306,4 +309,12 @@ public class ExamStudent extends BaseEntity implements Serializable {
     public void setCanDelete(Boolean canDelete) {
         this.canDelete = canDelete;
     }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
 }

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

@@ -187,7 +187,7 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
                 singleExamStudentAddParam.getStudentCode(), singleExamStudentAddParam.getStudentName(),
                 examDetail.getPackageCode(), examDetail.getExamPlace(), examDetail.getExamRoom(),
                 singleExamStudentAddParam.getCollege(), singleExamStudentAddParam.getMajorName(), singleExamStudentAddParam.getClassName(),
-                examDetail.getExamStartTime(), examDetail.getExamEndTime(), examTask.getUserId());
+                null, examDetail.getExamStartTime(), examDetail.getExamEndTime(), examTask.getUserId());
         if (markStudent.getSecretNumber() == null) {
             markStudent.randomSecretNumber();
             while (markStudentService.countByExamIdAndSecretNumber(markStudent.getExamId(), markStudent.getSecretNumber()) > 0) {

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

@@ -237,11 +237,12 @@
         limit 1
     </select>
 
-    <select id="listByExamDetailCourseIdNotIntMarkStudent" resultMap="BaseResultMap">
+    <select id="listByExamDetailCourseIdNotIntMarkStudent" resultType="com.qmth.distributed.print.business.entity.ExamStudent">
         SELECT
-            *
+            es.*,
+            su.real_name teacherName
         FROM
-            exam_student es
+            exam_student es left join sys_user su on es.teacher_id = su.id
         WHERE
             es.exam_detail_course_id = #{examDetailCourseId}
           AND es.paper_type = #{paperType}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkStudent.java

@@ -207,7 +207,7 @@ public class MarkStudent implements Serializable {
                        String paperNumber, String coursePaperId, String paperType,
                        String studentCode, String studentName, String packageCode,
                        String examPlace, String examRoom, String college, String majorName, String className,
-                       Long examStartTime, Long examEndTime, Long createId) {
+                       String teacher, Long examStartTime, Long examEndTime, Long createId) {
         this.id = id;
         this.examId = examId;
         this.courseCode = courseCode;
@@ -223,6 +223,7 @@ public class MarkStudent implements Serializable {
         this.college = college;
         this.majorName = majorName;
         this.className = className;
+        this.teacher = teacher;
         this.sheetCount = 0;
         this.upload = false;
         this.absent = false;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkQuestionServiceImpl.java

@@ -91,7 +91,7 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
         Map<String, Long> longMap = questions.stream().collect(Collectors.groupingBy(m -> String.valueOf(m.getMainNumber()) + m.getSubNumber(), Collectors.counting()));
         long count = longMap.entrySet().stream().filter(m -> m.getValue().intValue() > 1).count();
         if (count > 0) {
-            throw ExceptionResultEnum.ERROR.exception("大题号+小题号有重复数据");
+            throw ExceptionResultEnum.ERROR.exception("大题号-小题号有重复数据");
         }
 
         // 查询已有结构信息

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -93,6 +93,8 @@ import java.util.stream.Collectors;
 @Service
 public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkStudent> implements MarkStudentService {
 
+    @Resource
+    private SysUserService sysUserService;
     @Resource
     private BasicCourseService basicCourseService;
     @Autowired
@@ -1524,7 +1526,8 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         BasicCourse basicCourse = basicCourseService.getByCode(basicExamStudent.getCourseCode());
         BasicTeachClazz basicTeachClazz = this.baseMapper.getBasicTeachClazzById(basicExamStudent.getClazzId());
         if (markStudent == null) {
-            markStudent = new MarkStudent(basicExamStudent.getId(), basicExamStudent.getExamId(), basicExamStudent.getCourseCode(), basicCourse.getName(), basicExamStudent.getPaperNumber(), markPaper.getCoursePaperId(), "A", basicExamStudent.getStudentCode(), basicExamStudent.getStudentName(), "", basicExamStudent.getExamPlace(), basicExamStudent.getExamRoom(), basicExamStudent.getCollege(), basicExamStudent.getMajor(), basicTeachClazz.getClazzName(), basicExamStudent.getExamStartTime(), basicExamStudent.getExamEndTime(), markPaper.getUserId());
+            SysUser sysUser = sysUserService.getById(basicExamStudent.getTeacherId());
+            markStudent = new MarkStudent(basicExamStudent.getId(), basicExamStudent.getExamId(), basicExamStudent.getCourseCode(), basicCourse.getName(), basicExamStudent.getPaperNumber(), markPaper.getCoursePaperId(), "A", basicExamStudent.getStudentCode(), basicExamStudent.getStudentName(), "", basicExamStudent.getExamPlace(), basicExamStudent.getExamRoom(), basicExamStudent.getCollege(), basicExamStudent.getMajor(), basicTeachClazz.getClazzName(), sysUser == null ? null : sysUser.getRealName(), basicExamStudent.getExamStartTime(), basicExamStudent.getExamEndTime(), markPaper.getUserId());
             if (markStudent.getSecretNumber() == null) {
                 markStudent.randomSecretNumber();
                 while (secretNumberSet.contains(markStudent.getSecretNumber())

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -128,7 +128,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
                     if (markStudent != null) {
                         continue;
                     }
-                    MarkStudent student = new MarkStudent(examStudent.getId(), dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(), dto.getCoursePaperId(), paperType, examStudent.getStudentCode(), examStudent.getStudentName(), examDetail.getPackageCode(), examDetail.getExamPlace(), examDetail.getExamRoom(), examStudent.getCollegeName(), examStudent.getMajorName(), examStudent.getTeachClazzName(), dto.getExamStartTime(), dto.getExamEndTime(), dto.getCreateId());
+                    MarkStudent student = new MarkStudent(examStudent.getId(), dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(), dto.getCoursePaperId(), paperType, examStudent.getStudentCode(), examStudent.getStudentName(), examDetail.getPackageCode(), examDetail.getExamPlace(), examDetail.getExamRoom(), examStudent.getCollegeName(), examStudent.getMajorName(), examStudent.getTeachClazzName(), examStudent.getTeacherName(), dto.getExamStartTime(), dto.getExamEndTime(), dto.getCreateId());
                     if (student.getSecretNumber() == null) {
                         student.randomSecretNumber();
                         while (secretNumberSet.contains(student.getSecretNumber())