diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index 542a2a25..8697821c 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -1519,7 +1519,7 @@ public class ManageExcelUploadProc03Controller { jaWp = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list")); } if("".equals((String)resultMap.get("resultMsg"))){ - excelWp = ExcelUtil.getRsWp(strFile, "현장수압시험부정보", 1, 2, 9); + excelWp = ExcelUtil.getRsWp(strFile, "현장수압시험부정보", 1, 2, 8); resultMap = checkStep03_300_waterPressure_sub(request, params, excelWp, savePath, strFile, (List>) resultMap.get("list"),_projectCode,_holeCode); jaWpSub = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list")); } diff --git a/src/main/java/geoinfo/util/ExcelUtil.java b/src/main/java/geoinfo/util/ExcelUtil.java index 7e810764..d360938c 100644 --- a/src/main/java/geoinfo/util/ExcelUtil.java +++ b/src/main/java/geoinfo/util/ExcelUtil.java @@ -204,7 +204,10 @@ public class ExcelUtil { } if( sheetName.equals("현장투수시험부정보") && i == 2) { isOk = true; break; + } else if( sheetName.equals("현장수압시험부정보") && i == 2) { + isOk = true; break; } + if(cells[j] != null && cells[j].getContents() != null && !cells[j].getContents().trim().equals("")) { isOk = true; break; } } if(!isOk) { break; }