diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index fd30706d..a256199d 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -512,6 +512,15 @@ public class ManageExcelUploadProc03Controller { listMap = ("".equals(saveMap.get("pe3List")))?null:(List>) saveMap.get("pe3List"); if(null != listMap){ for(HashMap map : listMap){ + + + // 엑셀 업로드로 자료입력 시 - 입력 허용 + String SAMPLE_RD = (String)map.get("SAMPLE_RD"); + + if ("-".equals(SAMPLE_RD)) { // 단위중량 + map.put("SAMPLE_RD", "-999"); + } + logger.debug("=====>pe3List:" + map.toString()); basicService.insertTempFieldPermeability(map); } @@ -5336,7 +5345,7 @@ public class ManageExcelUploadProc03Controller { if(!StringUtil.containsCharOnly(excelWp.get("col4",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, i+"번째 케이싱길이(m)는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col5",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col5",i).trim(),"0123456789.-")){ resultMsg += String.format(fmtMsg, i+"번째 평균투수계수(cm/sec)는 실수만 입력이 가능합니다."); } testNoCheck[i-1] = (String)(excelWp.get("col0",i).trim()); @@ -5372,6 +5381,10 @@ public class ManageExcelUploadProc03Controller { for(int i=1; i < excelWp.getLength(); i++){ HashMap map = new HashMap<>(); + String fieldperAvgPermeability = excelWp.get("col5", i).trim(); + if("-".equals(fieldperAvgPermeability)) { + fieldperAvgPermeability = "-999"; + } map.put("projectCode", _projectCode); map.put("holeCode", _holeCode); map.put("seq", i); @@ -5381,7 +5394,8 @@ public class ManageExcelUploadProc03Controller { map.put("fieldperDepthTo", excelWp.get("col2", i).trim()); map.put("fieldperCasingDia", excelWp.get("col3", i).trim()); map.put("fieldperCasingHeight", excelWp.get("col4", i).trim()); - map.put("fieldperAvgPermeability", excelWp.get("col5", i).trim()); +// map.put("fieldperAvgPermeability", excelWp.get("col5", i).trim()); // [YJI / 26.04.09] 엑셀 업로드 '-' 입력 지원. 입력값이 '-' 이면 DB에 저장은 -999로 한다. + map.put("fieldperAvgPermeability", fieldperAvgPermeability); map.put("fieldperInspectedBy", excelWp.get("col6", i).trim()); map.put("fieldperCheckedBy", excelWp.get("col7", i).trim()); map.put("fieldperRemark", excelWp.get("col8", i).trim()); @@ -5440,7 +5454,7 @@ public class ManageExcelUploadProc03Controller { if(!StringUtil.containsCharOnly(excelWp.get("col2",k).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, k+"번째 시간간격(sec)은 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col3",k).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col3",k).trim(),"0123456789.-")){ resultMsg += String.format(fmtMsg, k+"번째 총수두(cm)는 실수만 입력이 가능합니다."); } if(!StringUtil.containsCharOnly(excelWp.get("col4",k).trim(),"0123456789.")){ @@ -5489,6 +5503,10 @@ public class ManageExcelUploadProc03Controller { } HashMap map = new HashMap<>(); + String fieldperSubFallingHead = excelWp.get("col3", k).trim(); + if("-".equals(fieldperSubFallingHead)) { + fieldperSubFallingHead = "-999"; + } map.put("projectCode", _projectCode); map.put("holeCode", _holeCode); map.put("seq", mSeq); @@ -5496,7 +5514,8 @@ public class ManageExcelUploadProc03Controller { map.put("fieldperOrder", tNo); map.put("fieldperSubTime", excelWp.get("col1", k).trim()); map.put("fieldperSubTotalHead", excelWp.get("col2", k).trim()); - map.put("fieldperSubFallingHead", excelWp.get("col3", k).trim()); +// map.put("fieldperSubFallingHead", excelWp.get("col3", k).trim()); // [YJI / 26.04.09] 엑셀 업로드 '-' 입력 지원. 입력값이 '-' 이면 DB에 저장은 -999로 한다. + map.put("fieldperSubFallingHead", fieldperSubFallingHead); map.put("fieldperSubWaterLoose", excelWp.get("col4", k).trim()); map.put("fieldperSubQuantity", excelWp.get("col5", k).trim()); map.put("fieldperSubPermeability", excelWp.get("col6", k).trim());