diff --git a/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java b/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java index c543f76..683bf9d 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java @@ -32,6 +32,10 @@ public class PairingController { ) { String fileName = file.getOriginalFilename() == null ? "pairing" : file.getOriginalFilename(); + if (fileName != null && fileName.endsWith(".xlsx")) { + fileName = fileName.substring(0, fileName.length() - 5); + } + try { byte[] bytes = pairingService.pairingMemberByCenterNew(file); return ExcelResponseBuilder.buildExcelResponse(fileName + " 결과.xlsx", bytes); diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java index 5b261b0..c5f0160 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java @@ -73,7 +73,7 @@ public class PairingExcelService { ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { ExcelMapper.appendSheetToWorkbook(workbook, result.getFinalAssignments(), - NewFinalAssignmentExcelDto.class, "최종 배정", headerRowIndex()); + NewFinalAssignmentExcelDto.class, "최종 배정 with 인접지역", headerRowIndex()); ExcelMapper.appendSheetToWorkbook(workbook, result.getFinalAssignmentsWithCenters(), NewFinalAssignmentWithCenterExcelDto.class, "최종 배정 with 센터", headerRowIndex()); ExcelMapper.appendSheetToWorkbook(workbook, result.getAdjacentRegions(), diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java index c5d7df2..e4494c1 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java @@ -48,7 +48,8 @@ public class PairingNewService { private static final long DATE_WEIGHT = 1_000_000_000L; private static final long PREFERENCE_WEIGHT = 1_000_000L; private static final long HISTORY_WEIGHT = 1_000L; - private static final boolean USE_AVAILABLE_ADJACENT_REGION_IN_PAIR_SCORE = false; + //배정 가능 인접지역 수를 페어 생성시 고려 + private static final boolean USE_AVAILABLE_ADJACENT_REGION_IN_PAIR_SCORE = true; private static final long AVAILABLE_ADJACENT_REGION_WEIGHT = 1_000_000_000_000_000L; private final PairingProperties pairingProperties;