diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java index 598aa160b..35ed19f34 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java +++ b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudyStudentResponse.java @@ -7,6 +7,7 @@ import com.gdschongik.gdsc.domain.study.domain.AchievementType; import com.gdschongik.gdsc.domain.study.domain.StudyAchievement; import com.gdschongik.gdsc.domain.study.domain.StudyHistory; +import com.gdschongik.gdsc.domain.study.domain.StudyHistoryStatus; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -17,6 +18,7 @@ public record StudyStudentResponse( @Schema(description = "디스코드 사용자명") String discordUsername, @Schema(description = "디스코드 닉네임") String nickname, @Schema(description = "깃허브 링크") String githubLink, + @Schema(description = "수료 상태") StudyHistoryStatus studyHistoryStatus, @Schema(description = "1차 우수 스터디원") boolean isFirstRoundOutstandingStudent, @Schema(description = "2차 우수 스터디원") boolean isSecondRoundOutstandingStudent, @Schema(description = "과제 및 출석 이력") List studyTodos, @@ -45,6 +47,7 @@ public static StudyStudentResponse of( studyHistory.getStudent().getDiscordUsername(), studyHistory.getStudent().getNickname(), studyHistory.getRepositoryLink(), + studyHistory.getStudyHistoryStatus(), isOutstandingStudent(FIRST_ROUND_OUTSTANDING_STUDENT, studyAchievements), isOutstandingStudent(SECOND_ROUND_OUTSTANDING_STUDENT, studyAchievements), studyTodos, diff --git a/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java b/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java index 7580c77b0..29f1a04b9 100644 --- a/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java +++ b/src/main/java/com/gdschongik/gdsc/global/common/constant/WorkbookConstant.java @@ -10,7 +10,7 @@ public class WorkbookConstant { // Study public static final String[] STUDY_SHEET_HEADER = { - "이름", "학번", "디스코드 유저네임", "커뮤니티 닉네임", "깃허브 링크", "수료 여부", "1차 우수 스터디원 여부", "2차 우수 스터디원 여부", "출석률", "과제 수행률" + "이름", "학번", "디스코드 유저네임", "커뮤니티 닉네임", "깃허브 링크", "수료 상태", "1차 우수 스터디원 여부", "2차 우수 스터디원 여부", "출석률", "과제 수행률" }; public static final String WEEKLY_ASSIGNMENT = "%d주차 과제"; public static final String WEEKLY_ATTENDANCE = "%d주차 출석"; diff --git a/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java b/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java index 5ca7974a1..a7037d37a 100644 --- a/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java +++ b/src/main/java/com/gdschongik/gdsc/global/util/ExcelUtil.java @@ -79,8 +79,9 @@ private void createStudySheet(Workbook workbook, Study study, List