Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentCompetitionRankingDto.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @Author Joburgess
  * @Date 2020.11.10
@@ -8,6 +10,8 @@ public class StudentCompetitionRankingDto {
 
     private Long competitionId;
 
+    private Integer prizeLevel;
+
     private String username;
 
     private String pictureUrl;
@@ -15,12 +19,21 @@ public class StudentCompetitionRankingDto {
     public StudentCompetitionRankingDto() {
     }
 
-    public StudentCompetitionRankingDto(Long competitionId, String username, String pictureUrl) {
+    public StudentCompetitionRankingDto(Long competitionId, Integer prizeLevel, String username, String pictureUrl) {
         this.competitionId = competitionId;
+        this.prizeLevel = prizeLevel;
         this.username = username;
         this.pictureUrl = pictureUrl;
     }
 
+    public Integer getPrizeLevel() {
+        return prizeLevel;
+    }
+
+    public void setPrizeLevel(Integer prizeLevel) {
+        this.prizeLevel = prizeLevel;
+    }
+
     public Long getCompetitionId() {
         return competitionId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCompetitionServiceImpl.java

@@ -79,7 +79,7 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 		List<StudentCompetition> winnerList = studentCompetitionDao.getWinnerList();
 		List<StudentCompetitionRankingDto> winnerSimpleInfoList = new ArrayList<>();
 		for (StudentCompetition studentCompetition : winnerList) {
-			winnerSimpleInfoList.add(new StudentCompetitionRankingDto(studentCompetition.getId(), studentCompetition.getUsername(), studentCompetition.getPictureUrl()));
+			winnerSimpleInfoList.add(new StudentCompetitionRankingDto(studentCompetition.getId(), studentCompetition.getPrizeLevel(), studentCompetition.getUsername(), studentCompetition.getPictureUrl()));
 		}
 		return winnerSimpleInfoList;
 	}