diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java index f0738720..f73b544a 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java @@ -148,6 +148,9 @@ public class ManageExcelUploadProc01Controller { List map2 = selectClass2019Service.selectTest1(params); EgovMap map3 = selectClass2019Service.selectTest2(params); + if( map3.get("resistivityCount") == null ) { + throw new Exception("map3.get(\"resistivityCount\") is null"); + } String resistivityCount = String.valueOf(map3.get("resistivityCount")); String refractionCount = String.valueOf(map3.get("refractionCount")); diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index 81bb46a5..542a2a25 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -1259,8 +1259,7 @@ public class ManageExcelUploadProc03Controller { */ @SuppressWarnings("unchecked") @RequestMapping(value = "/stepUpload03.do", method = RequestMethod.POST) - public @ResponseBody String stepUpload03(@RequestParam List files, HashMap params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest multi) throws Exception{ - WebUtil wUtil = new WebUtil(); + public @ResponseBody String stepUpload03(@RequestParam List files, HashMap params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest multi) throws Exception{ WebUtil wUtil = new WebUtil(); strUtil sUtil = new strUtil(); String resultMsg = ""; @@ -1532,7 +1531,7 @@ public class ManageExcelUploadProc03Controller { jaPe = (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, 8); + excelWp = ExcelUtil.getRsWp(strFile, "현장투수시험부정보", 1, 2, 7); resultMap = checkStep03_300_permeablity_sub(request, params, excelWp, savePath, strFile, (List>) resultMap.get("list"),_projectCode,_holeCode); jaPeSub = (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 49774ccd..7e810764 100644 --- a/src/main/java/geoinfo/util/ExcelUtil.java +++ b/src/main/java/geoinfo/util/ExcelUtil.java @@ -165,6 +165,11 @@ public class ExcelUtil { //2 public static RsWrapper getRsWp(String excelPath, String sheetName, int colNmRow, int startRow, int maxCol) throws Exception { RsWrapper rsWp = new RsWrapper(); + + if( sheetName == null ) { + throw new Exception("sheetName is null"); + } + Sheet exlSheet = getExcelWorkSheet(excelPath, sheetName); if(exlSheet == null) { return rsWp; } @@ -181,6 +186,25 @@ public class ExcelUtil { if(cells == null) { break; } boolean isOk = false; for(short j=0; j < maxCol && j < cells.length; j++) { + if( cells[j] == null ) { + System.out.println("excelPath: [" + excelPath + "]\n" + + "sheetName: [" + sheetName + "]\n" + + "cells[" + j + "]: [" + "cells[" + j + "]" + " is null ]\n" + ); + } else if( cells[j].getContents() == null ) { + System.out.println("excelPath: [" + excelPath + "]\n" + + "sheetName: [" + sheetName + "]\n" + + "cells[" + j + "].getContents(): [" + "cells[" + j + "].getContents()" + " is null ]\n" + ); + } else if( cells[j].getContents().trim().equals("") ) { + System.out.println("excelPath: [" + excelPath + "]\n" + + "sheetName: [" + sheetName + "]\n" + + "cells[" + j + "].getContents().trim().equals(\"\"): [" + "cells[" + j + "].getContents().trim().equals(\"\")" + " is empty ]\n" + ); + } + 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; } diff --git a/src/main/webapp/WEB-INF/views/web/input/excel_step31.jsp b/src/main/webapp/WEB-INF/views/web/input/excel_step31.jsp index f7720243..33e2afbe 100644 --- a/src/main/webapp/WEB-INF/views/web/input/excel_step31.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/excel_step31.jsp @@ -948,6 +948,7 @@ function fn_help_tour(){
+ 저장버튼은 ↑↑↑↑ 위로 화면 스크롤 후, 시추공번호(BH001, TB001 등) 우측에 '저장 후 다음 시추공 입력' 버튼이 존재합니다.