diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index a6380f24..81cc8ef0 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -572,6 +572,37 @@ public class ManageExcelUploadProc03Controller { List> listMap = ("".equals(saveMap.get("sm4List")))?null:(List>) saveMap.get("sm4List"); if(null != listMap){ for(HashMap map : listMap){ + // 엑셀 업로드로 자료입력 시 - 입력 허용 + String SAMPLE_DEPTH_FROM = (String)map.get("SAMPLE_DEPTH_FROM"); + String SAMPLE_DEPTH_TO = (String)map.get("SAMPLE_DEPTH_TO"); + String SAMPLE_GS = (String)map.get("SAMPLE_GS"); + String SAMPLE_WC = (String)map.get("SAMPLE_WC"); + String SAMPLE_LL = (String)map.get("SAMPLE_LL"); + String SAMPLE_PI = (String)map.get("SAMPLE_PI"); + String SAMPLE_RD = (String)map.get("SAMPLE_RD"); + + if ("-".equals(SAMPLE_DEPTH_FROM)) { // 심도(From) + map.put("SAMPLE_DEPTH_FROM", "-999"); + } + if ("-".equals(SAMPLE_DEPTH_TO)) { // 심도(To) + map.put("SAMPLE_DEPTH_TO", "-999"); + } + if ("-".equals(SAMPLE_GS)) { // 함수비 + map.put("SAMPLE_GS", "-999"); + } + if ("-".equals(SAMPLE_WC)) { // 비중 + map.put("SAMPLE_WC", "-999"); + } + if ("-".equals(SAMPLE_LL)) { // 액성한계 + map.put("SAMPLE_LL", "-999"); + } + if ("-".equals(SAMPLE_PI)) { // 소성지수 + map.put("SAMPLE_PI", "-999"); + } + if ("-".equals(SAMPLE_RD)) { // 단위중량 + map.put("SAMPLE_RD", "-999"); + } + logger.debug("=====>sm4List:" + map.toString()); sampleInfoService.insertSampleInfo(map); }