1.0.4 bug修改

src/main/java/com/qmth/eds/bean/dto/ExamAssignDto.java

@@ -8,6 +8,12 @@ public class ExamAssignDto extends ExamAssign {
 
     private Integer actualCount;
 
+    private String formulaStr;
+
+    private String statusStr;
+
+    private String resultStr;
+
     private List<String> inspectCollege;
 
     public Integer getActualCount() {
@@ -25,4 +31,28 @@ public class ExamAssignDto extends ExamAssign {
     public void setInspectCollege(List<String> inspectCollege) {
         this.inspectCollege = inspectCollege;
     }
+
+    public String getFormulaStr() {
+        return formulaStr;
+    }
+
+    public void setFormulaStr(String formulaStr) {
+        this.formulaStr = formulaStr;
+    }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
+    public String getResultStr() {
+        return resultStr;
+    }
+
+    public void setResultStr(String resultStr) {
+        this.resultStr = resultStr;
+    }
 }

src/main/java/com/qmth/eds/service/impl/ExamAssignServiceImpl.java

@@ -15,6 +15,7 @@ import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.entity.*;
 import com.qmth.eds.common.enums.ExamAssignStatusEnum;
 import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.enums.FormulaEnum;
 import com.qmth.eds.common.util.FileUtil;
 import com.qmth.eds.common.util.ServletUtil;
 import com.qmth.eds.mapper.ExamAssignMapper;
@@ -91,7 +92,10 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
             if (examAssign != null) {
                 record.setId(examAssign.getId());
                 record.setFormula(examAssign.getFormula());
+                record.setFormulaStr(examAssign.getFormula() != null ? examAssign.getFormula().getName() : "/");
                 record.setStatus(examAssign.getStatus());
+                record.setStatusStr(examAssign.getStatus().getDesc());
+                record.setResultStr(ExamAssignStatusEnum.FINISH.equals(examAssign.getStatus()) ? StringUtils.isBlank(examAssign.getErrorMsg()) ? "成功" : "失败" : "/");
                 record.setPublish(examAssign.getPublish());
             }
         }
@@ -159,7 +163,7 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
 
     @Override
     public ExamAssignDto toCalc(Long semesterId, Long examTypeId, Long collegeId, String courseCode, String courseName, String openCollege) {
-        if(StringUtils.isBlank(openCollege)){
+        if (StringUtils.isBlank(openCollege)) {
             throw ExceptionResultEnum.ERROR.exception("未查询到开课学院，无法进行计算，请联系管理员处理");
         }
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());

src/main/resources/mapper/ExamAssignMapper.xml

@@ -104,6 +104,8 @@
                exam_type_id examTypeId,
                course_code courseCode,
                course_name courseName,
+               open_round openRound,
+               open_total_score_round openTotalScoreRound,
                open_college openCollege,
                formula,
                coefficient,