20231030.0 버전 적용 (#296)

themoment-team · Oct 30, 2023 · adf881a · adf881a
1 parent d620e83
commit adf881a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...rc/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java b/...rc/main/java/team/themoment/hellogsm/web/domain/application/mapper/ApplicationMapper.java
@@ -26,6 +26,7 @@
 import team.themoment.hellogsm.web.domain.identity.dto.domain.IdentityDto;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -409,7 +410,7 @@ default List<List<String>> applicationToExcelDataList(List<Application> applicat
             if (admissionStatus.getSecondScore().isEmpty()) {
                 finalScore = null;
             } else {
-                finalScore = admissionGrade.getTotalScore().add(admissionStatus.getSecondScore().get());
+                finalScore = admissionGrade.getTotalScore().divide(BigDecimal.valueOf(3), 3, RoundingMode.HALF_UP).add(admissionStatus.getSecondScore().get());
             }
 
             BigDecimal curricularSubtotalScore;
@@ -456,6 +457,7 @@ default List<List<String>> applicationToExcelDataList(List<Application> applicat
                     String.valueOf(admissionGrade.getTotalScore()),
                     String.valueOf(admissionStatus.getSecondScore().orElse(null)),
                     String.valueOf(finalScore),
+                    String.valueOf(admissionStatus.getFinalMajor().orElse(null)),
                     admissionInfo.getApplicantPhoneNumber(),
                     admissionInfo.getGuardianPhoneNumber(),
                     String.valueOf(admissionInfo.getTeacherPhoneNumber().orElse(null))

diff --git a/...team/themoment/hellogsm/web/domain/application/service/impl/DownloadExcelServiceImpl.java b/...team/themoment/hellogsm/web/domain/application/service/impl/DownloadExcelServiceImpl.java
@@ -51,6 +51,7 @@ public class DownloadExcelServiceImpl implements DownloadExcelService {
             "전형총점",
             "인적성평가점수",
             "최종점수",
+            "최종학과",
             "지원자연락처",
             "부모연락처",
             "담임연락처"