From 17f69cf0fe373a31223aa9fdfe6f55ecb666b713 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 15 Sep 2026 12:31:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?260915=5F01=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=B5=9C?= =?UTF-8?q?=EC=8B=A0=20=EA=B2=B0=EA=B3=BC=20=EB=B0=8F=20=EC=BB=A8=ED=83=9D?= =?UTF-8?q?=20=EC=9D=B4=EB=A0=A5=20=EC=97=91=EC=85=80=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/ListEventHistoryOrder.java | 9 + .../server/controller/ListController.java | 7 +- .../controller/ListHistoryController.java | 6 +- .../list/ListEventHistDownloadRequestDto.java | 8 + .../server/service/ListDownloadService.java | 447 +++++++++++++++++- .../server/service/ListSearchService.java | 32 ++ src/main/resources/application-local.yml | 3 +- 7 files changed, 497 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListEventHistoryOrder.java diff --git a/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryOrder.java b/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryOrder.java new file mode 100644 index 0000000..66ed727 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryOrder.java @@ -0,0 +1,9 @@ +package com.kri.contact.server.common.enums; + +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "컨택 이력 다운로드 정렬 순서") +public enum ListEventHistoryOrder { + ASC, + DESC +} diff --git a/src/main/java/com/kri/contact/server/controller/ListController.java b/src/main/java/com/kri/contact/server/controller/ListController.java index 1368f50..2b9db10 100644 --- a/src/main/java/com/kri/contact/server/controller/ListController.java +++ b/src/main/java/com/kri/contact/server/controller/ListController.java @@ -118,10 +118,15 @@ public class ListController { @PostMapping("/excel/download/{prjctIdx}") public ResponseEntity downloadList( @PathVariable Long prjctIdx, + @RequestParam(defaultValue = "true") boolean includeResult, @Valid @RequestBody(required = false) ListFilterDto listFilter ) { ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); - byte[] bytes = listDownloadService.downloadList(prjctIdx, listFilter); + byte[] bytes = listDownloadService.downloadList( + prjctIdx, + listFilter, + includeResult + ); return buildExcelResponse(projectInfoDto.getPrjctName() + " list.xlsx", bytes); } diff --git a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java index ecf8335..622a9e0 100644 --- a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java +++ b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -65,6 +66,7 @@ public class ListHistoryController { @PostMapping("/excel/download/event/{prjctIdx}") public ResponseEntity downloadListWithEventHistory( @PathVariable Long prjctIdx, + @RequestParam(defaultValue = "true") boolean includeResult, @Valid @RequestBody ListEventHistDownloadRequestDto request ) { ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); @@ -73,7 +75,9 @@ public class ListHistoryController { request.getListFilter(), request.getResultCodeTypes(), request.getSearchBase(), - request.getDateRange() + request.getDateRange(), + request.getHistoryOrder(), + includeResult ); return buildExcelResponse(projectInfoDto.getPrjctName() + " 컨택 이력.xlsx", bytes); } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java index cdb824b..dc14bf4 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java @@ -1,6 +1,7 @@ package com.kri.contact.server.dto.list; import com.kri.contact.server.common.enums.ListEventHistoryBase; +import com.kri.contact.server.common.enums.ListEventHistoryOrder; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.common.DateRangeDto; import io.swagger.v3.oas.annotations.media.Schema; @@ -31,7 +32,14 @@ public class ListEventHistDownloadRequestDto { @Schema(description = "조회 기준") private ListEventHistoryBase searchBase; + @Schema(description = "이력 정렬 순서. ASC=오래된 이력 우선, DESC=최근 이력 우선", defaultValue = "ASC") + private ListEventHistoryOrder historyOrder = ListEventHistoryOrder.ASC; + @Valid @Schema(description = "조회 기간") private DateRangeDto dateRange; + + public ListEventHistoryOrder getHistoryOrder() { + return historyOrder == null ? ListEventHistoryOrder.ASC : historyOrder; + } } diff --git a/src/main/java/com/kri/contact/server/service/ListDownloadService.java b/src/main/java/com/kri/contact/server/service/ListDownloadService.java index ca84a7a..e707390 100644 --- a/src/main/java/com/kri/contact/server/service/ListDownloadService.java +++ b/src/main/java/com/kri/contact/server/service/ListDownloadService.java @@ -6,6 +6,7 @@ import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.excel.ExcelMapper; import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.enums.ListEventHistoryBase; +import com.kri.contact.server.common.enums.ListEventHistoryOrder; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.common.enums.ResultCodeType; @@ -15,9 +16,11 @@ import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.dto.list.ListUploadFileInfoDto; import com.kri.contact.server.persistence.entity.TListItemFileEntity; import com.kri.contact.server.persistence.entity.id.TListItemFileEntityId; +import com.kri.contact.server.persistence.entity.TPrjctEntity; import com.kri.contact.server.persistence.entity.TPrjctSurveyEntity; import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.repository.ListItemFileRepository; +import com.kri.contact.server.persistence.repository.ProjectRepository; import com.kri.contact.server.persistence.repository.ProjectSurveyRepository; import com.kri.contact.server.persistence.repository.ResultCodeRepository; import com.kri.contact.server.service.file.ListItemFileService; @@ -25,8 +28,10 @@ import java.io.ByteArrayOutputStream; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -35,6 +40,14 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.stereotype.Service; @Service @@ -47,8 +60,13 @@ public class ListDownloadService { private static final String HEADER_USER = "사용자"; private static final String HEADER_RESULT = "결과"; private static final String HEADER_MEMO = "메모"; + private static final String HEADER_CONTACT_RESULT = "컨택 결과"; + private static final String HEADER_INTERVIEW_RESULT = "현장면접 결과"; + private static final String HEADER_SURVEY_RESULT_PREFIX = "설문 결과 - "; private static final String HEADER_BEFORE = "변경전"; private static final String HEADER_AFTER = "변경후"; + private static final String EXCEL_SHEET_NAME = "Sheet1"; + private static final int EVENT_HISTORY_HEADER_ROW_INDEX = 2; private static final String ZERO_WIDTH_SPACE = String.valueOf(Character.toChars(0x200B)); private static final List EVENT_HISTORY_HEADERS = List.of( @@ -59,6 +77,17 @@ public class ListDownloadService { HEADER_RESULT, HEADER_MEMO ); + private static final List LATEST_CONTACT_HISTORY_HEADERS = List.of( + HEADER_DATE, + HEADER_USER, + HEADER_RESULT, + HEADER_MEMO + ); + private static final List LATEST_SURVEY_HISTORY_HEADERS = List.of( + HEADER_DATE, + HEADER_RESULT, + HEADER_MEMO + ); private static final List UPDATE_HISTORY_HEADERS = List.of( HEADER_DATE, HEADER_USER, @@ -71,14 +100,30 @@ public class ListDownloadService { private final ListItemFileRepository listItemFileRepository; private final ListItemFileService listItemFileService; private final ResultCodeRepository resultCodeRepository; + private final ProjectRepository projectRepository; private final ProjectSurveyRepository projectSurveyRepository; private final ObjectMapper objectMapper; - public byte[] downloadList(Long prjctIdx, ListFilterDto listFilter) { + public byte[] downloadList( + Long prjctIdx, + ListFilterDto listFilter, + boolean includeResult + ) { List headers = getSortedHeaders(prjctIdx); + List baseHeaderNames = toBaseHeaderNames(headers); + List latestResultColumns = includeResult + ? createLatestResultColumns(prjctIdx, baseHeaderNames) + : List.of(); + Map resultLabelMap = includeResult + ? createResultLabelMap(prjctIdx) + : Map.of(); + List excelHeaders = new ArrayList<>(baseHeaderNames); + latestResultColumns.stream() + .map(LatestResultColumn::headerName) + .forEach(excelHeaders::add); try ( - ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(toBaseHeaderNames(headers), 100); + ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(excelHeaders, 100); ByteArrayOutputStream out = new ByteArrayOutputStream() ) { String lastSid = null; @@ -88,8 +133,18 @@ public class ListDownloadService { break; } + Map> latestResultMap = includeResult + ? findLatestResultMap(prjctIdx, rows) + : Map.of(); + for (ListSearchService.DownloadListRow row : rows) { - writer.append(createBaseRow(headers, row)); + writer.append(createListRow( + headers, + row, + latestResultColumns, + latestResultMap.getOrDefault(row.sid(), List.of()), + resultLabelMap + )); lastSid = row.sid(); } } @@ -108,7 +163,9 @@ public class ListDownloadService { ListFilterDto listFilter, Collection resultCodeTypes, ListEventHistoryBase searchBase, - DateRangeDto dateRange + DateRangeDto dateRange, + ListEventHistoryOrder historyOrder, + boolean includeResult ) { if (searchBase == null) { throw BusinessException.internalError("이력 기준은 필수입니다."); @@ -117,15 +174,39 @@ public class ListDownloadService { validateDateRange(dateRange); List headers = getSortedHeaders(prjctIdx); Map resultLabelMap = createResultLabelMap(prjctIdx); - Map surveyNameMap = createSurveyNameMap(prjctIdx); - int maxHistoryCount = findMaxEventHistoryCount(prjctIdx, listFilter, resultCodeTypes, searchBase, dateRange); - List excelHeaders = new ArrayList<>(toBaseHeaderNames(headers)); - appendRepeatedHeaders(excelHeaders, EVENT_HISTORY_HEADERS, maxHistoryCount); + Map surveyNameMap = searchBase == ListEventHistoryBase.ALL + ? createSurveyNameMap(prjctIdx) + : Map.of(); + List baseHeaderNames = toBaseHeaderNames(headers); + List latestResultColumns = includeResult + ? createLatestResultColumns(prjctIdx, baseHeaderNames) + : List.of(); + int maxHistoryCount = searchBase == ListEventHistoryBase.ALL + ? findMaxEventHistoryCount(prjctIdx, listFilter, resultCodeTypes, searchBase, dateRange) + : 0; + List excelHeaders = new ArrayList<>(baseHeaderNames); + latestResultColumns.stream() + .map(LatestResultColumn::headerName) + .forEach(excelHeaders::add); + EventHistoryLayout eventHistoryLayout = createEventHistoryLayout( + prjctIdx, + resultCodeTypes, + searchBase, + excelHeaders, + maxHistoryCount + ); try ( - ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(excelHeaders, 100); + SXSSFWorkbook workbook = ExcelMapper.createStreamingWorkbook(100); + ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter( + workbook, + excelHeaders, + EXCEL_SHEET_NAME, + EVENT_HISTORY_HEADER_ROW_INDEX + ); ByteArrayOutputStream out = new ByteArrayOutputStream() ) { + appendEventHistorySectionHeaders(workbook, eventHistoryLayout.sections()); String lastSid = null; while (true) { List rows = listSearchService.findDownloadListRows(prjctIdx, listFilter, lastSid); @@ -141,6 +222,9 @@ public class ListDownloadService { searchBase, dateRange ); + Map> latestResultMap = includeResult + ? findLatestResultMap(prjctIdx, rows) + : Map.of(); for (ListSearchService.DownloadListRow row : rows) { writer.append(createEventHistoryRow( @@ -149,7 +233,12 @@ public class ListDownloadService { historyMap.getOrDefault(row.sid(), List.of()), resultLabelMap, surveyNameMap, - maxHistoryCount + maxHistoryCount, + searchBase, + historyOrder, + eventHistoryLayout.latestSections(), + latestResultColumns, + latestResultMap.getOrDefault(row.sid(), List.of()) )); lastSid = row.sid(); } @@ -374,17 +463,51 @@ public class ListDownloadService { return excelRow; } + private Map createListRow( + List headers, + ListSearchService.DownloadListRow row, + List latestResultColumns, + List latestResults, + Map resultLabelMap + ) { + Map excelRow = createBaseRow(headers, row); + appendLatestResults(excelRow, latestResultColumns, latestResults, resultLabelMap); + return excelRow; + } + private Map createEventHistoryRow( List headers, ListSearchService.DownloadListRow row, List histories, Map resultLabelMap, Map surveyNameMap, - int maxHistoryCount + int maxHistoryCount, + ListEventHistoryBase searchBase, + ListEventHistoryOrder historyOrder, + List latestHistorySections, + List latestResultColumns, + List latestResults ) { Map excelRow = createBaseRow(headers, row); + appendLatestResults(excelRow, latestResultColumns, latestResults, resultLabelMap); + if (searchBase == ListEventHistoryBase.LATEST) { + appendLatestEventHistories( + excelRow, + latestHistorySections, + histories, + resultLabelMap + ); + return excelRow; + } + + List orderedHistories = orderEventHistories( + histories, + historyOrder + ); for (int index = 0; index < maxHistoryCount; index++) { - ListSearchService.EventHistoryRow history = index < histories.size() ? histories.get(index) : null; + ListSearchService.EventHistoryRow history = index < orderedHistories.size() + ? orderedHistories.get(index) + : null; excelRow.put(createRepeatedHeaderName(HEADER_TYPE, index), history == null ? "" : resolveEventTypeLabel(history.eventTy())); excelRow.put(createRepeatedHeaderName(HEADER_SURVEY, index), history == null ? "" : resolveSurveyName(history, surveyNameMap)); excelRow.put(createRepeatedHeaderName(HEADER_DATE, index), history == null ? "" : formatDateTime(history.regDt())); @@ -395,6 +518,273 @@ public class ListDownloadService { return excelRow; } + private EventHistoryLayout createEventHistoryLayout( + Long prjctIdx, + Collection resultCodeTypes, + ListEventHistoryBase searchBase, + List excelHeaders, + int maxHistoryCount + ) { + if (searchBase == ListEventHistoryBase.LATEST) { + List latestSections = appendLatestHistoryHeaders( + prjctIdx, + resultCodeTypes, + excelHeaders + ); + return new EventHistoryLayout( + latestSections.stream().map(LatestHistorySection::headerSection).toList(), + latestSections + ); + } + + int firstHistoryColumn = excelHeaders.size(); + appendRepeatedHeaders(excelHeaders, EVENT_HISTORY_HEADERS, maxHistoryCount); + List sections = new ArrayList<>(); + for (int index = 0; index < maxHistoryCount; index++) { + int startColumn = firstHistoryColumn + index * EVENT_HISTORY_HEADERS.size(); + sections.add(new HistoryHeaderSection( + String.valueOf(index + 1), + startColumn, + startColumn + EVENT_HISTORY_HEADERS.size() - 1 + )); + } + return new EventHistoryLayout(sections, List.of()); + } + + private List appendLatestHistoryHeaders( + Long prjctIdx, + Collection resultCodeTypes, + List excelHeaders + ) { + Set selectedTypes = resultCodeTypes.stream() + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + Set usedHeaderNames = new LinkedHashSet<>(excelHeaders); + List sections = new ArrayList<>(); + + if (selectedTypes.contains(ResultCodeType.CONTACT)) { + sections.add(appendLatestHistorySection( + excelHeaders, + usedHeaderNames, + "컨택", + ResultCodeType.CONTACT.getCode(), + null, + LATEST_CONTACT_HISTORY_HEADERS + )); + } + + if (selectedTypes.contains(ResultCodeType.INTERVIEW) && isFieldInterviewProject(prjctIdx)) { + sections.add(appendLatestHistorySection( + excelHeaders, + usedHeaderNames, + "현장 면접", + ResultCodeType.INTERVIEW.getCode(), + null, + LATEST_CONTACT_HISTORY_HEADERS + )); + } + + if (selectedTypes.contains(ResultCodeType.SURVEY)) { + for (TPrjctSurveyEntity survey + : projectSurveyRepository.findByPrjctIdxOrderBySurveyOrderAscPrjctSurveyIdxAsc(prjctIdx)) { + sections.add(appendLatestHistorySection( + excelHeaders, + usedHeaderNames, + "설문 - " + survey.getSurveyNm(), + ResultCodeType.SURVEY.getCode(), + survey.getPrjctSurveyIdx(), + LATEST_SURVEY_HISTORY_HEADERS + )); + } + } + return sections; + } + + private LatestHistorySection appendLatestHistorySection( + List excelHeaders, + Set usedHeaderNames, + String title, + Short eventTy, + Long prjctSurveyIdx, + List displayHeaders + ) { + int startColumn = excelHeaders.size(); + Map headerNames = new LinkedHashMap<>(); + for (String displayHeader : displayHeaders) { + String headerName = createUniqueHeaderName(displayHeader, usedHeaderNames); + excelHeaders.add(headerName); + headerNames.put(displayHeader, headerName); + } + return new LatestHistorySection( + new HistoryHeaderSection(title, startColumn, excelHeaders.size() - 1), + eventTy, + prjctSurveyIdx, + headerNames.get(HEADER_DATE), + headerNames.get(HEADER_USER), + headerNames.get(HEADER_RESULT), + headerNames.get(HEADER_MEMO) + ); + } + + private void appendLatestEventHistories( + Map excelRow, + List sections, + List histories, + Map resultLabelMap + ) { + Map historyMap = histories.stream() + .collect(Collectors.toMap( + history -> new LatestResultKey(history.eventTy(), history.prjctSurveyIdx()), + history -> history, + (left, right) -> right, + LinkedHashMap::new + )); + + for (LatestHistorySection section : sections) { + ListSearchService.EventHistoryRow history = historyMap.get( + new LatestResultKey(section.eventTy(), section.prjctSurveyIdx()) + ); + excelRow.put(section.dateHeader(), history == null ? "" : formatDateTime(history.regDt())); + if (section.userHeader() != null) { + excelRow.put(section.userHeader(), history == null ? "" : defaultString(history.regUser())); + } + excelRow.put( + section.resultHeader(), + history == null ? "" : resolveResultLabel(history, resultLabelMap) + ); + excelRow.put(section.memoHeader(), history == null ? "" : defaultString(history.memo())); + } + } + + private void appendEventHistorySectionHeaders( + SXSSFWorkbook workbook, + List sections + ) { + Sheet sheet = workbook.getSheet(EXCEL_SHEET_NAME); + Row row = sheet.createRow(0); + CellStyle style = createSectionHeaderStyle(workbook); + for (HistoryHeaderSection section : sections) { + for (int column = section.startColumn(); column <= section.endColumn(); column++) { + row.createCell(column).setCellStyle(style); + } + row.getCell(section.startColumn()).setCellValue(section.title()); + sheet.addMergedRegion(new CellRangeAddress( + 0, + 0, + section.startColumn(), + section.endColumn() + )); + } + } + + private CellStyle createSectionHeaderStyle(SXSSFWorkbook workbook) { + CellStyle style = workbook.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font font = workbook.createFont(); + font.setBold(true); + style.setFont(font); + return style; + } + + private boolean isFieldInterviewProject(Long prjctIdx) { + TPrjctEntity project = projectRepository.findByPrjctIdxAndDelFalse(prjctIdx); + if (project == null) { + throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다.") + .with("prjctIdx", prjctIdx); + } + return Boolean.TRUE.equals(project.getFf()); + } + + private void appendLatestResults( + Map excelRow, + List columns, + List latestResults, + Map resultLabelMap + ) { + Map resultCodeMap = latestResults.stream() + .collect(Collectors.toMap( + result -> new LatestResultKey(result.eventTy(), result.prjctSurveyIdx()), + ListSearchService.LatestResultRow::resultCd, + (left, right) -> right, + LinkedHashMap::new + )); + + for (LatestResultColumn column : columns) { + Integer resultCode = resultCodeMap.get(new LatestResultKey(column.eventTy(), column.prjctSurveyIdx())); + String resultLabel = resultLabelMap.get(new EventResultKey(column.eventTy(), resultCode)); + excelRow.put(column.headerName(), resultCode == null ? "" : defaultString(resultLabel == null ? resultCode : resultLabel)); + } + } + + private Map> findLatestResultMap( + Long prjctIdx, + List rows + ) { + List sids = rows.stream() + .map(ListSearchService.DownloadListRow::sid) + .toList(); + return listSearchService.findLatestResultsForDownload(prjctIdx, sids); + } + + private List createLatestResultColumns( + Long prjctIdx, + Collection baseHeaderNames + ) { + TPrjctEntity project = projectRepository.findByPrjctIdxAndDelFalse(prjctIdx); + if (project == null) { + throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다.") + .with("prjctIdx", prjctIdx); + } + + List columns = new ArrayList<>(); + Set usedHeaderNames = new LinkedHashSet<>(baseHeaderNames); + columns.add(new LatestResultColumn( + createUniqueHeaderName(HEADER_CONTACT_RESULT, usedHeaderNames), + ResultCodeType.CONTACT.getCode(), + null + )); + if (Boolean.TRUE.equals(project.getFf())) { + columns.add(new LatestResultColumn( + createUniqueHeaderName(HEADER_INTERVIEW_RESULT, usedHeaderNames), + ResultCodeType.INTERVIEW.getCode(), + null + )); + } + for (TPrjctSurveyEntity survey + : projectSurveyRepository.findByPrjctIdxOrderBySurveyOrderAscPrjctSurveyIdxAsc(prjctIdx)) { + columns.add(new LatestResultColumn( + createUniqueHeaderName( + HEADER_SURVEY_RESULT_PREFIX + survey.getSurveyNm(), + usedHeaderNames + ), + ResultCodeType.SURVEY.getCode(), + survey.getPrjctSurveyIdx() + )); + } + return columns; + } + + private String createUniqueHeaderName(String headerName, Set usedHeaderNames) { + String uniqueHeaderName = headerName; + while (!usedHeaderNames.add(uniqueHeaderName)) { + uniqueHeaderName += ZERO_WIDTH_SPACE; + } + return uniqueHeaderName; + } + + private List orderEventHistories( + List histories, + ListEventHistoryOrder historyOrder + ) { + if (historyOrder != ListEventHistoryOrder.DESC || histories.size() < 2) { + return histories; + } + List orderedHistories = new ArrayList<>(histories); + Collections.reverse(orderedHistories); + return orderedHistories; + } + private Map createUpdateHistoryRow( String sid, List histories, @@ -559,4 +949,37 @@ public class ListDownloadService { Short eventTy, Integer resultCd ) {} + + private record LatestResultKey( + Short eventTy, + Long prjctSurveyIdx + ) {} + + private record LatestResultColumn( + String headerName, + Short eventTy, + Long prjctSurveyIdx + ) {} + + private record HistoryHeaderSection( + String title, + int startColumn, + int endColumn + ) {} + + private record LatestHistorySection( + HistoryHeaderSection headerSection, + Short eventTy, + Long prjctSurveyIdx, + String dateHeader, + String userHeader, + String resultHeader, + String memoHeader + ) {} + + private record EventHistoryLayout( + List sections, + List latestSections + ) {} + } diff --git a/src/main/java/com/kri/contact/server/service/ListSearchService.java b/src/main/java/com/kri/contact/server/service/ListSearchService.java index 6a58b2b..635ef96 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -193,6 +193,32 @@ public class ListSearchService { .toList(); } + @Transactional(readOnly = true) + public Map> findLatestResultsForDownload( + Long prjctIdx, + Collection sids + ) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyMap(); + } + + return listEventHistRepository + .findLatestListByEventTyFromLatest(prjctIdx, new ArrayList<>(sids)) + .stream() + .collect(Collectors.groupingBy( + TListEventHistEntity::getSid, + LinkedHashMap::new, + Collectors.mapping( + entity -> new LatestResultRow( + entity.getEventTy(), + entity.getPrjctSurveyIdx(), + entity.getResultCd() + ), + Collectors.toList() + ) + )); + } + @Transactional(readOnly = true) public List findDownloadSids( Long prjctIdx, @@ -780,6 +806,12 @@ public class ListSearchService { AssignValues assignValues ) {} + public record LatestResultRow( + Short eventTy, + Long prjctSurveyIdx, + Integer resultCd + ) {} + public record EventHistoryRow( Short eventTy, Long prjctSurveyIdx, diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 11b6030..7976d3c 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -9,7 +9,8 @@ kri: spring: datasource: #public 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true + #url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver -- 2.49.0.windows.1 From de705520018e751c64829f9f4ec28d1b574194bb Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 15 Sep 2026 12:32:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?260915=5F02=5FBUG:=20=EB=A1=9C=EC=BB=AC=20y?= =?UTF-8?q?ml=20=ED=8C=8C=EC=9D=BC=20=EB=90=98=EB=8F=8C=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-local.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 7976d3c..11b6030 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -9,8 +9,7 @@ kri: spring: datasource: #public 도메인 - #url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver -- 2.49.0.windows.1