diff --git a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java index 71613ed..df79d89 100644 --- a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java +++ b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java @@ -807,12 +807,12 @@ public class ConstructionProjectManagementController { HashMap map = new HashMap(); - String[] headers = {"cid","constName","projectStateCodeName","constStartDate","constStateCodeName","masterCompanyDept","masterCompanyAdmin","masterCompanyTel","coinstCompanyDept","constCompanyAdmin","constCompanyTel"}; - String[][] headerNames = {{"연번", "사업명", "입력상태", "사업내용", "", "", "발주기관현황", "", "", "건설사현황", ""}, - {"", "", "", "사업기간", "사업단계", "담당부서", "담당자", "담당자연락처", "건설사명", "담당자", "담당자연락처"}}; + String[] headers = {"cid","constName","projectStateCodeName","constStartDate","constStateCodeName","inquiryDist" ,"masterCompanyDept","masterCompanyAdmin","masterCompanyTel","coinstCompanyDept","constCompanyAdmin","constCompanyTel"}; + String[][] headerNames = {{"연번", "사업명", "입력상태", "사업내용", "", "발주기관현황", "", "", "", "건설사현황", "", ""}, + {"", "", "", "사업기간", "사업단계", "발주처", "담당부서", "담당자", "담당자연락처", "건설사명", "담당자", "담당자연락처"}}; - final int[] headerWidths = {1325, 15900, 4240, 6360, 5830, 6890, 2915, 3710, 5035, 2915, 3710}; - String[] columnType = {"String", "String", "String", "String", "String", "String", "String", "String", "String", "String", "String"}; + final int[] headerWidths = {1325, 15900, 4240, 6360, 5830, 8830, 6890, 2915, 3710, 5035, 2915, 3710}; + String[] columnType = {"String", "String", "String", "String", "String", "String", "String", "String", "String", "String", "String", "String"}; String sheetName = "Sheet1"; String excelFileName = "발주기관 건설현장 목록"; @@ -833,7 +833,22 @@ public class ConstructionProjectManagementController { String constEndDate = (String) rowData.get("constEndDate"); rowData.put("constStartDate", constStartDate + " ~ " + constEndDate); // 공사기간을 'startDate ~ endDate' 형식으로 변환 rowData.put("cid", (totalCount) - (idx++)); - + + String glName = ""; + String gmName = ""; + String gsName = ""; + String inquiryDist = ""; // 발주처 + if ((String)rowData.get("glName") != null) { + glName = (String)rowData.get("glName"); + inquiryDist = inquiryDist + glName + " "; + }if ((String)rowData.get("gmName") != null) { + gmName = (String)rowData.get("gmName"); + inquiryDist = inquiryDist + gmName + " "; + }if ((String)rowData.get("gsName") != null) { + gsName = (String)rowData.get("gsName"); + inquiryDist = inquiryDist + gsName; + } + rowData.put("inquiryDist", inquiryDist); } diff --git a/src/main/java/geoinfo/util/ExcelMergeHeaderUtil.java b/src/main/java/geoinfo/util/ExcelMergeHeaderUtil.java index b74ceec..01f5c53 100644 --- a/src/main/java/geoinfo/util/ExcelMergeHeaderUtil.java +++ b/src/main/java/geoinfo/util/ExcelMergeHeaderUtil.java @@ -222,9 +222,9 @@ public class ExcelMergeHeaderUtil { sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); // 입력상태 // === 가로 병합 (대분류) === - sheet.addMergedRegion(new CellRangeAddress(0, 0, 3, 5)); // 사업내용 - sheet.addMergedRegion(new CellRangeAddress(0, 0, 6, 8)); // 발주기관현황 - sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 10)); // 건설사현황 + sheet.addMergedRegion(new CellRangeAddress(0, 0, 3, 4)); // 사업내용 + sheet.addMergedRegion(new CellRangeAddress(0, 0, 5, 8)); // 발주기관현황 + sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 11)); // 건설사현황 // 헤더 정보 구성 for (int i = 0; i < headerNames.length; i++) {