考勤统计调整

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -171,8 +171,8 @@ public class TeacherAwardController {
                 if(rowData.getIsThesis() == null){
                     rowData.setIsThesis("");
                 }
-                if(rowData.getCompetitionName() == null){
-                    rowData.setCompetitionName("");
+                if(rowData.getWholeCompetitionName() == null){
+                    rowData.setWholeCompetitionName("");
                 }
                 if(rowData.getMediaType() == null){
                     rowData.setMediaType("");
@@ -181,7 +181,6 @@ public class TeacherAwardController {
                     rowData.setTeacherAwardItemScore("");
                 }
 
-
                 if(el.getIsThesis() == 1){
                     rowData.setIsThesis("是");
                 }else if(el.getIsThesis() == 0){

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailExcelVo.java

@@ -22,7 +22,7 @@ public class TeacherAwardDetailExcelVo {
 
     @ExcelProperty("奖项名称")
     @ApiModelProperty("奖项名称")
-    private String competitionName;
+    private String wholeCompetitionName;
 
     @ExcelProperty("是否论文")
     @ApiModelProperty("是否论文")