fix bug

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -353,7 +353,7 @@ public class TEExamStudentController {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
-        commonMarkResult(examId);
+//        commonMarkResult(examId);
         return ResultUtil.ok(teExamStudentService.markResultQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, courseCode));
     }
 
@@ -371,7 +371,7 @@ public class TEExamStudentController {
         }
         TBTaskHistory tbTaskHistory = null;
         try {
-            commonMarkResult(examId);
+//            commonMarkResult(examId);
             Map transMap = new HashMap();
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             //往任务表里插一条数据
@@ -414,7 +414,7 @@ public class TEExamStudentController {
         }
         TBTaskHistory tbTaskHistory = null;
         try {
-            commonMarkResult(examId);
+//            commonMarkResult(examId);
             Map transMap = new HashMap();
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             //往任务表里插一条数据

themis-business/src/main/java/com/qmth/themis/business/dto/MarkResultSimpleExportDto.java

@@ -33,7 +33,7 @@ public class MarkResultSimpleExportDto {
     private String courseName;
 
     @ExcelNote(value = "考场代码")
-    private String roomCode; //考场代码
+    private String roomCode;
 
     @ExcelNote(value = "考场名称")
     private String roomName; //考场名称
@@ -48,27 +48,27 @@ public class MarkResultSimpleExportDto {
 
     @ApiModelProperty(value = "是否缺考")
     @ExcelNote(value = "是否缺考")
-    private Boolean examAbsent;
+    private String examAbsent;
 
     @ApiModelProperty(value = "违纪次数")
     @ExcelNote(value = "违纪次数")
-    private Integer breachCount;
+    private String breachCount;
 
     @ApiModelProperty(value = "考试次数")
-    @ExcelNote(value = "examCount")
-    private Integer examCount;
+    @ExcelNote(value = "考试次数")
+    private String examCount;
 
     @ApiModelProperty(value = "客观分")
     @ExcelNote(value = "客观分")
-    private Double objectiveScore;
+    private String objectiveScore;
 
     @ApiModelProperty(value = "主观分")
     @ExcelNote(value = "主观分")
-    private Double subjectiveScore;
+    private String subjectiveScore;
 
     @ApiModelProperty(value = "总分")
     @ExcelNote(value = "总分")
-    private Double sumScore;
+    private String sumScore;
 
     public String getRoomCode() {
         return roomCode;
@@ -142,51 +142,51 @@ public class MarkResultSimpleExportDto {
         this.classNo = classNo;
     }
 
-    public Boolean getExamAbsent() {
+    public String getExamAbsent() {
         return examAbsent;
     }
 
-    public void setExamAbsent(Boolean examAbsent) {
+    public void setExamAbsent(String examAbsent) {
         this.examAbsent = examAbsent;
     }
 
-    public Integer getBreachCount() {
+    public String getBreachCount() {
         return breachCount;
     }
 
-    public void setBreachCount(Integer breachCount) {
+    public void setBreachCount(String breachCount) {
         this.breachCount = breachCount;
     }
 
-    public Integer getExamCount() {
+    public String getExamCount() {
         return examCount;
     }
 
-    public void setExamCount(Integer examCount) {
+    public void setExamCount(String examCount) {
         this.examCount = examCount;
     }
 
-    public Double getObjectiveScore() {
+    public String getObjectiveScore() {
         return objectiveScore;
     }
 
-    public void setObjectiveScore(Double objectiveScore) {
+    public void setObjectiveScore(String objectiveScore) {
         this.objectiveScore = objectiveScore;
     }
 
-    public Double getSubjectiveScore() {
+    public String getSubjectiveScore() {
         return subjectiveScore;
     }
 
-    public void setSubjectiveScore(Double subjectiveScore) {
+    public void setSubjectiveScore(String subjectiveScore) {
         this.subjectiveScore = subjectiveScore;
     }
 
-    public Double getSumScore() {
+    public String getSumScore() {
         return sumScore;
     }
 
-    public void setSumScore(Double sumScore) {
+    public void setSumScore(String sumScore) {
         this.sumScore = sumScore;
     }
 }

themis-business/src/main/java/com/qmth/themis/business/dto/response/MarkResultDto.java

@@ -43,7 +43,7 @@ public class MarkResultDto implements Serializable {
     private String classNo;
 
     @ApiModelProperty(value = "缺考")
-    private Boolean examAbsent;
+    private String examAbsent;
 
     @ApiModelProperty(value = "违纪次数")
     private Integer breachCount;
@@ -167,11 +167,11 @@ public class MarkResultDto implements Serializable {
         this.classNo = classNo;
     }
 
-    public Boolean getExamAbsent() {
+    public String getExamAbsent() {
         return examAbsent;
     }
 
-    public void setExamAbsent(Boolean examAbsent) {
+    public void setExamAbsent(String examAbsent) {
         this.examAbsent = examAbsent;
     }
 

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultSimpleExportTemplete.java

@@ -85,7 +85,7 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
             }
             //创建excel
             wb = new SXSSFWorkbook();
-            Sheet sheet = wb.createSheet("成绩简版导出");
+            Sheet sheet = wb.createSheet("成绩统计简版");
             CellStyle style = wb.createCellStyle();
             style.setAlignment(HorizontalAlignment.CENTER); // 水平居中格式
             style.setVerticalAlignment(VerticalAlignment.CENTER); //垂直居中

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultStandardExportTemplete.java

@@ -86,7 +86,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
             }
             //创建excel
             wb = new SXSSFWorkbook();
-            Sheet sheet = wb.createSheet("成绩标准版导出");
+            Sheet sheet = wb.createSheet("成绩统计标准版");
             CellStyle style = wb.createCellStyle();
             style.setAlignment(HorizontalAlignment.CENTER); // 水平居中格式
             style.setVerticalAlignment(VerticalAlignment.CENTER); //垂直居中

themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -291,7 +291,7 @@
 		t.roomName,
 		t.grade,
 		t.classNo,
-		if(t.examCount <![CDATA[ <= ]]> 0,true,false) as examAbsent,
+		if(t.examCount <![CDATA[ <= ]]> 0,'是','否') as examAbsent,
 		t.examCount,
 		t.examName,
 		if(t.breachCount is null,0,t.breachCount) as breachCount,