3.3.0 fix

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanStudentController.java

@@ -58,8 +58,7 @@ public class ScanStudentController {
     @ApiOperation(value = "未扫描-导出")
     @RequestMapping(value = "/unexist/export", method = RequestMethod.POST)
     public void exportUnexist(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                              @ApiParam(value = "试卷编号", required = true) @RequestParam String coursePaperId,
                               HttpServletResponse response) {
-        markStudentService.exportUnexist(examId, coursePaperId, response);
+        markStudentService.exportUnexist(examId, response);
     }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/score/StudentScoreDetailDto.java

@@ -21,7 +21,7 @@ public class StudentScoreDetailDto {
     private String className;
     private String objectiveScore;
     private String subjectiveScore;
-    private String totalScoreString;
+    private String totalScore;
     private String subjectiveScoreList;
     private String checkUserId;
     private String checkUserLoginName;
@@ -125,12 +125,12 @@ public class StudentScoreDetailDto {
         this.subjectiveScore = subjectiveScore;
     }
 
-    public String getTotalScoreString() {
-        return totalScoreString;
+    public String getTotalScore() {
+        return totalScore;
     }
 
-    public void setTotalScoreString(String totalScoreString) {
-        this.totalScoreString = totalScoreString;
+    public void setTotalScore(String totalScore) {
+        this.totalScore = totalScore;
     }
 
     public String getSubjectiveScoreList() {

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

@@ -64,5 +64,5 @@ public interface MarkStudentMapper extends BaseMapper<MarkStudent> {
 	List<ClassVo> classData(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
 	List<TeacherVo> teacher(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
 
-    List<UnexistStudentDto> listUnexistStudentByExamIdAndCoursePaperId(@Param("examId") Long examId, @Param("coursePaperId") String coursePaperId);
+    List<UnexistStudentDto> listUnexistStudentByExamIdAndCoursePaperId(@Param("examId") Long examId);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java

@@ -110,5 +110,5 @@ public interface MarkStudentService extends IService<MarkStudent> {
 
 	ScoreReportVo scoreReport(Long examId, String paperNumber);
 
-    void exportUnexist(Long examId, String coursePaperId, HttpServletResponse response);
+    void exportUnexist(Long examId, HttpServletResponse response);
 }

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

@@ -898,10 +898,9 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
 	}
 
 	@Override
-	public void exportUnexist(Long examId, String coursePaperId, HttpServletResponse response) {
+	public void exportUnexist(Long examId, HttpServletResponse response) {
 		try {
-			List<UnexistStudentDto> unexistStudentDtoList = this.baseMapper
-					.listUnexistStudentByExamIdAndCoursePaperId(examId, coursePaperId);
+			List<UnexistStudentDto> unexistStudentDtoList = this.baseMapper.listUnexistStudentByExamIdAndCoursePaperId(examId);
 			ExcelUtil.excelExport("评卷员工作量", UnexistStudentDto.class, unexistStudentDtoList, response);
 		} catch (Exception e) {
 			throw ExceptionResultEnum.ERROR.exception("导出评卷员工作量失败");

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

@@ -58,6 +58,7 @@
             ms.class_name className,
             ms.objective_score objectiveScore,
             ms.subjective_score subjectiveScore,
+            ifnull(ms.objective_score, 0) +  ifnull(ms.subjective_score, 0) totalScore,
             ms.subjective_score_list subjectiveScoreList,
             ms.check_user_id checkUserId,
             ms.check_time checkTime
@@ -341,7 +342,8 @@
         FROM
             mark_student t
         WHERE
-            t.exam_id = #{examId} AND t.course_paper_id = #{coursePaperId}
+            t.exam_id = #{examId}
           AND t.scan_status = 'UNEXIST'
+        order by t.student_code
     </select>
 </mapper>