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 e707390..b8c5079 100644 --- a/src/main/java/com/kri/contact/server/service/ListDownloadService.java +++ b/src/main/java/com/kri/contact/server/service/ListDownloadService.java @@ -508,12 +508,12 @@ public class ListDownloadService { 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())); - excelRow.put(createRepeatedHeaderName(HEADER_USER, index), history == null ? "" : defaultString(history.regUser())); - excelRow.put(createRepeatedHeaderName(HEADER_RESULT, index), history == null ? "" : resolveResultLabel(history, resultLabelMap)); - excelRow.put(createRepeatedHeaderName(HEADER_MEMO, index), history == null ? "" : defaultString(history.memo())); + excelRow.put(createEventHistoryHeaderName(HEADER_TYPE, index), history == null ? "" : resolveEventTypeLabel(history.eventTy())); + excelRow.put(createEventHistoryHeaderName(HEADER_SURVEY, index), history == null ? "" : resolveSurveyName(history, surveyNameMap)); + excelRow.put(createEventHistoryHeaderName(HEADER_DATE, index), history == null ? "" : formatDateTime(history.regDt())); + excelRow.put(createEventHistoryHeaderName(HEADER_USER, index), history == null ? "" : defaultString(history.regUser())); + excelRow.put(createEventHistoryHeaderName(HEADER_RESULT, index), history == null ? "" : resolveResultLabel(history, resultLabelMap)); + excelRow.put(createEventHistoryHeaderName(HEADER_MEMO, index), history == null ? "" : defaultString(history.memo())); } return excelRow; } @@ -538,7 +538,7 @@ public class ListDownloadService { } int firstHistoryColumn = excelHeaders.size(); - appendRepeatedHeaders(excelHeaders, EVENT_HISTORY_HEADERS, maxHistoryCount); + appendEventHistoryHeaders(excelHeaders, maxHistoryCount); List sections = new ArrayList<>(); for (int index = 0; index < maxHistoryCount; index++) { int startColumn = firstHistoryColumn + index * EVENT_HISTORY_HEADERS.size(); @@ -824,6 +824,18 @@ public class ListDownloadService { return defaultString(row.itemMap().get(header.getListHderId())); } + private void appendEventHistoryHeaders(List headers, int repeatCount) { + for (int index = 0; index < repeatCount; index++) { + for (String header : EVENT_HISTORY_HEADERS) { + headers.add(createEventHistoryHeaderName(header, index)); + } + } + } + + private String createEventHistoryHeaderName(String headerName, int index) { + return headerName + "#" + (index + 1); + } + private void appendRepeatedHeaders(List headers, List repeatedHeaders, int repeatCount) { for (int index = 0; index < repeatCount; index++) { for (String repeatedHeader : repeatedHeaders) {