From e2a40e0209c4a1f9b27a7ad67e2dbd2755c27e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Fri, 10 Apr 2026 10:31:36 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=97=85=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=EC=8B=9C=EC=8A=A4=ED=85=9C:=20=ED=86=A0?= =?UTF-8?q?=EC=82=AC=EC=8B=9C=ED=97=98-=EC=9D=BC=EC=B6=95=EC=95=95?= =?UTF-8?q?=EC=B6=95=EC=8B=9C=ED=97=98(=EC=96=91=EC=8B=9D=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B2=98=EB=A6=AC=20=EB=B0=98=EC=98=81;?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EB=AC=BC=EC=84=B1=EC=8B=9C=ED=97=98=EC=9D=98?= =?UTF-8?q?=20=EC=8B=9C=EB=A3=8C=EB=B2=88=ED=98=B8=EB=A5=BC=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=99=80=20=EC=B2=98=EB=A6=AC=ED=95=9C=EB=8B=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManageExcelUploadProc03Controller.java | 92 ++++++++++++------- 1 file changed, 58 insertions(+), 34 deletions(-) diff --git a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java index a256199d..99e52e73 100644 --- a/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java +++ b/src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java @@ -4489,52 +4489,55 @@ public class ManageExcelUploadProc03Controller { List> list = new ArrayList>(); resultMsg = imageUpload(params,"일축압축정보 그래프", savePath, strFile, resultMsg, "[토사시험정보 - 일축압축시험 그래프] %s|", "일축압축시험결과 그래프",excelWp.getLength()); for(int i=0; i < excelWp.getLength(); i++){ - if(!StringUtil.containsCharOnly(excelWp.get("col0",i).trim(),"0123456789.")){ +// if(!StringUtil.containsCharOnly(excelWp.get("col0",i).trim(),"0123456789.")){ +// resultMsg += String.format(fmtMsg, "링계수는 실수만 입력이 가능합니다."); +// } + if(!StringUtil.containsCharOnly(excelWp.get("col1",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "링계수는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col1",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col2",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "하중값는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col2",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col3",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 높이는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col3",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col4",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 직경은 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col4",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col5",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 함수비는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col5",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col6",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 단위중량은 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col6",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col7",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 공극비는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col7",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col8",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 포화도는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col8",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col9",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "자연시료 일축압축강도는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col9",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col10",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 높이 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col10",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col11",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 직경은 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col11",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col12",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 함수비는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col12",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col13",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 단위중량은 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col13",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col14",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 공극비는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col14",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col15",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 포화도는 실수만 입력이 가능합니다."); } - if(!StringUtil.containsCharOnly(excelWp.get("col15",i).trim(),"0123456789.")){ + if(!StringUtil.containsCharOnly(excelWp.get("col16",i).trim(),"0123456789.")){ resultMsg += String.format(fmtMsg, "제성형시료 일축압축강도는 실수만 입력이 가능합니다."); } @@ -4543,28 +4546,49 @@ public class ManageExcelUploadProc03Controller { return params; } int testNo3 = Integer.valueOf(excelWp.get("col0",i).trim()) -1; + int testNo = testNo3 + 1; // 사용자가 입력한 순번(물성시험 샘플을 순번으로 찾을때 사용) + + String targetSampleCode = null; + + // private List> _sampleInfoList + for (Map sample : _sampleInfoList) { + String sampleCode = (String) sample.get("SAMPLE_CODE"); + + // SAMPLE_CODE 끝 숫자 추출 + String numberPart = sampleCode.replaceAll(".*?(\\d+)$", "$1"); + int number = Integer.parseInt(numberPart); + + if (number == testNo) { + targetSampleCode = sampleCode; + break; + } + } + + HashMap map = new HashMap<>(); map.put("PROJECT_CODE", _projectCode); map.put("HOLE_CODE", _holeCode); - map.put("SAMPLE_CODE" , (String) _sampleInfoList.get(i).get("SAMPLE_CODE")); +// map.put("SAMPLE_CODE" , (String) _sampleInfoList.get(i).get("SAMPLE_CODE")); + map.put("SAMPLE_CODE", targetSampleCode); map.put("UNCONF_RINGFACTOR" , excelWp.get("col0", i)); - map.put("UNCONF_LOAD_SCALE" , excelWp.get("col1", i)); - map.put("UNCONF_UNDISTURB_HEIGHT" , excelWp.get("col2", i)); - map.put("UNCONF_UNDISTURB_DIA" , excelWp.get("col3", i)); - map.put("UNCONF_UNDISTURB_W" , excelWp.get("col4", i)); - map.put("UNCONF_UNDISTURB_RT" , excelWp.get("col5", i)); - map.put("UNCONF_UNDISTURB_E" , excelWp.get("col6", i)); - map.put("UNCONF_UNDISTURB_S" , excelWp.get("col7", i)); - map.put("UNCONF_UNDISTURB_COMPSTRENGTH" , excelWp.get("col8", i)); - map.put("UNCONF_REMOULD_HEIGHT" , excelWp.get("col9", i)); - map.put("UNCONF_REMOULD_DIA" , excelWp.get("col10", i)); - map.put("UNCONF_REMOULD_W" , excelWp.get("col11", i)); - map.put("UNCONF_REMOULD_RT" , excelWp.get("col12", i)); - map.put("UNCONF_REMOULD_E" , excelWp.get("col13", i)); - map.put("UNCONF_REMOULD_S" , excelWp.get("col14", i)); - map.put("UNCONF_REMOULD_COMPSTRENGTH" , excelWp.get("col15", i)); - map.put("UNCONF_SAMPLE_SHAPE" , excelWp.get("col16", i)); - map.put("UNCONF_REMARK" , excelWp.get("col17", i)); + map.put("UNCONF_RINGFACTOR" , excelWp.get("col1", i)); + map.put("UNCONF_LOAD_SCALE" , excelWp.get("col2", i)); + map.put("UNCONF_UNDISTURB_HEIGHT" , excelWp.get("col3", i)); + map.put("UNCONF_UNDISTURB_DIA" , excelWp.get("col4", i)); + map.put("UNCONF_UNDISTURB_W" , excelWp.get("col5", i)); + map.put("UNCONF_UNDISTURB_RT" , excelWp.get("col6", i)); + map.put("UNCONF_UNDISTURB_E" , excelWp.get("col7", i)); + map.put("UNCONF_UNDISTURB_S" , excelWp.get("col8", i)); + map.put("UNCONF_UNDISTURB_COMPSTRENGTH" , excelWp.get("col9", i)); + map.put("UNCONF_REMOULD_HEIGHT" , excelWp.get("col10", i)); + map.put("UNCONF_REMOULD_DIA" , excelWp.get("col11", i)); + map.put("UNCONF_REMOULD_W" , excelWp.get("col12", i)); + map.put("UNCONF_REMOULD_RT" , excelWp.get("col13", i)); + map.put("UNCONF_REMOULD_E" , excelWp.get("col14", i)); + map.put("UNCONF_REMOULD_S" , excelWp.get("col15", i)); + map.put("UNCONF_REMOULD_COMPSTRENGTH" , excelWp.get("col16", i)); + map.put("UNCONF_SAMPLE_SHAPE" , excelWp.get("col17", i)); + map.put("UNCONF_REMARK" , excelWp.get("col18", i)); map.put("USERID" , request.getSession().getAttribute("USERID")); map.put("graphImage" , params.get("GRAPH_IMAGE"+testNo3) );