Browse Source

教师获奖登记导出调整

dzx 1 year ago
parent
commit
13722f1a15

+ 2 - 2
src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -155,9 +155,9 @@ public class TeacherAwardController {
                     rowData.setIssueDate("");
                 }else{
                     if(el.getIsThesis() == 1){
-                        rowData.setIssueDate(sdf.format(el.getAwardDate()));
-                    }else if(el.getIsThesis() == 0){
                         rowData.setIssueDate(sdf.format(el.getIssueDate()));
+                    }else if(el.getIsThesis() == 0){
+                        rowData.setIssueDate(sdf.format(el.getAwardDate()));
                     }
                 }
                 if(rowData.getRemark() == null){

+ 3 - 0
src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -132,4 +132,7 @@ public class TeacherAwardDetailPageVo {
 
     @ApiModelProperty("奖项分数")
     private String teacherAwardItemScore;
+
+    @ApiModelProperty("赛事名称")
+    private String eventName;
 }