Browse Source

1.1.0 update

xiaofei 1 year ago
parent
commit
3b45ffef38

+ 11 - 2
src/main/java/com/qmth/eds/bean/dto/ExamAssignDto.java

@@ -15,6 +15,7 @@ public class ExamAssignDto extends ExamAssign {
     private String formulaStr;
 
     private String statusStr;
+    private String resultStr;
 
     private List<String> inspectCollege;
 
@@ -53,7 +54,7 @@ public class ExamAssignDto extends ExamAssign {
     }
 
     public String getFormulaStr() {
-        return super.getFormula() != null ? super.getFormula().getName() : null;
+        return formulaStr;
     }
 
     public void setFormulaStr(String formulaStr) {
@@ -61,10 +62,18 @@ public class ExamAssignDto extends ExamAssign {
     }
 
     public String getStatusStr() {
-        return super.getStatus() != null ? super.getStatus().getDesc() : null;
+        return statusStr;
     }
 
     public void setStatusStr(String statusStr) {
         this.statusStr = statusStr;
     }
+
+    public String getResultStr() {
+        return resultStr;
+    }
+
+    public void setResultStr(String resultStr) {
+        this.resultStr = resultStr;
+    }
 }

+ 3 - 0
src/main/java/com/qmth/eds/service/impl/ExamAssignServiceImpl.java

@@ -70,7 +70,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());
             }
         }