3.4.0 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ConvertUtil.java

@@ -148,11 +148,11 @@ public class ConvertUtil {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(new Date(startTime));
             tmpDateStart = (new SimpleDateFormat("yyyy-MM-dd")).format(calendar.getTime());
-            tmpTimeStart = (new SimpleDateFormat("HH:mm:ss")).format(calendar.getTime());
+            tmpTimeStart = (new SimpleDateFormat("HH:mm")).format(calendar.getTime());
 
             calendar.setTime(new Date(endTime));
             tmpDateEnd = (new SimpleDateFormat("yyyy-MM-dd")).format(calendar.getTime());
-            tmpTimeEnd = (new SimpleDateFormat("HH:mm:ss")).format(calendar.getTime());
+            tmpTimeEnd = (new SimpleDateFormat("HH:mm")).format(calendar.getTime());
 
             if (!tmpDateStart.equals(tmpDateEnd)) {
                 throw ExceptionResultEnum.ERROR.exception("开始时间和结束时间不在同一天");

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/ScanOmrTaskMapper.java

@@ -28,13 +28,14 @@ public interface ScanOmrTaskMapper extends BaseMapper<ScanOmrTask> {
 
     IPage<ScanStudentDto> listByExamIdAndStatusAndUserId(@Param("page") Page<ScanStudentDto> page,
                                                          @Param(value = "examId") Long examId,
+                                                         @Param(value = "scanStatus") String scanStatus,
                                                          @Param("courseId") Long courseId,
                                                          @Param("coursePaperId") String coursePaperId,
                                                          @Param(value = "status") OmrTaskStatus status,
                                                          @Param("studentCodeOrName") String studentCodeOrName,
                                                          @Param("markPaperStatus") String markPaperStatus, @Param("dpr") DataPermissionRule dpr);
 
-    int getStudentCountByExamAndStatusAndUserId(@Param(value = "examId") Long examId,
+    int getStudentCountByExamAndStatusAndUserId(@Param(value = "examId") Long examId,@Param(value = "scanStatus") String scanStatus,
                                                 @Param("courseId") Long courseId, @Param("coursePaperId") String coursePaperId, @Param(value = "status") String status, @Param("markPaperStatus") String markPaperStatus, @Param("dpr") DataPermissionRule dpr);
 
     int getStudentCountByExamAndStatusAndUserIdNew(@Param(value = "examId") Long examId,

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

@@ -707,7 +707,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 studentObjectiveAnswerDto.setStandardAnswer(q != null ? q.getAnswer() : null);
                 studentObjectiveAnswerDto.setAnswer(answer);
                 studentObjectiveAnswerDto.setScore(Double.valueOf(answerScore));
-                studentObjectiveAnswerDto.setTotalScore(q.getTotalScore());
+                studentObjectiveAnswerDto.setTotalScore(q != null ? q.getTotalScore() : 0);
                 studentObjectiveAnswerDto.setExist(q != null && q.getTotalScore() > 0);
                 studentObjectiveAnswerDto.setQuestionType(q != null ? q.getQuestionType() : 0);
                 answerDtoList.add(studentObjectiveAnswerDto);
@@ -1035,10 +1035,10 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                                                    ScanStatus status) {
         MarkStudent student = findByExamIdAndCoursePaperIdAndStudentCode(examId, coursePaperId, studentCode);
         if (student == null) {
-            throw new ParameterException("考生未找到");
+            throw ExceptionResultEnum.ERROR.exception("考生未找到");
         }
         if (ScanStatus.MANUAL_ABSENT.equals(status) && !ScanStatus.UNEXIST.equals(student.getScanStatus())) {
-            throw new ParameterException("考生不是未扫描状态");
+            throw ExceptionResultEnum.ERROR.exception("考生不是未扫描状态");
         }
         LambdaUpdateWrapper<MarkStudent> lw = new LambdaUpdateWrapper<>();
         lw.set(MarkStudent::getScanStatus, status);

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

@@ -616,7 +616,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
     @Override
     public int getFinishStudentCountByExamAndUserId(Long examId, Long courseId, String coursePaperId, String status,
                                                     DataPermissionRule dpr) {
-        return this.baseMapper.getStudentCountByExamAndStatusAndUserId(examId, courseId, coursePaperId, status,
+        return this.baseMapper.getStudentCountByExamAndStatusAndUserId(examId, ScanStatus.SCANNED.name(), courseId, coursePaperId, status,
                 MarkPaperStatus.FORMAL.name(), dpr);
     }
 
@@ -664,7 +664,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(),
                 sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.listByExamIdAndStatusAndUserId(new Page<>(pageNumber, pageSize), examId, courseId, coursePaperId, status, studentCodeOrName,
+        return this.baseMapper.listByExamIdAndStatusAndUserId(new Page<>(pageNumber, pageSize), examId, ScanStatus.SCANNED.name(), courseId, coursePaperId, status, studentCodeOrName,
                 MarkPaperStatus.FORMAL.name(), dpr);
     }
 

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -822,7 +822,8 @@
                ms.course_paper_id,
                ms.exam_id,
                ms.exam_place,
-               ms.exam_room
+               ms.exam_room,
+               ms.scan_status
                from mark_student ms
             LEFT JOIN
             basic_exam_student bes on ms.basic_student_id = bes.id

teachcloud-mark/src/main/resources/mapper/ScanOmrTaskMapper.xml

@@ -44,6 +44,9 @@
 				<if test="examId != null">
 					and s.exam_id = #{examId}
 				</if>
+				<if test="scanStatus != null">
+					and s.scan_status = #{scanStatus}
+				</if>
 				<if test="courseId != null">
 					and s.course_id = #{courseId}
 				</if>
@@ -82,6 +85,9 @@
 			<if test="examId != null">
 				and s.exam_id = #{examId}
 			</if>
+			<if test="scanStatus != null">
+				and s.scan_status = #{scanStatus}
+			</if>
 			<if test="courseId != null">
 				and s.course_id = #{courseId}
 			</if>