From 21a2a6780b475433edc256c019574f9851be351f Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 7 Jan 2025 14:46:10 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=BC=EC=B6=95=EC=95=95=EC=B6=95=20S?= =?UTF-8?q?-S=20=EA=B7=B8=EB=9E=98=ED=94=84=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 암석시험정보 > 일축압축에서 '일축압축시험결과 그래프'에서 파괴형태 만 업로드 후 저장한다. 그리고 다시 Stress-Strain 그래프만 업로드하려고 하면 아래와 같이 에러가 발생한다. --- list.txt | 8 +- .../projectList/ProjectListController.java | 165 +++++++++--------- .../sqlmap/mapper/main/Home_SQL.xml | 16 +- .../sqlmap/mapper/map/MapLeft_SQL.xml | 11 +- .../sqlmap/mapper/map/MapMain_SQL.xml | 3 +- .../sqlmap/mapper/regi/projectList.xml | 61 ++++--- .../webapp/WEB-INF/views/web/input/header.jsp | 2 +- .../views/web/input/uniaxial/rockUniaxial.jsp | 10 ++ src/main/webapp/web/preview/HOLE.reb | Bin 579938 -> 581034 bytes 9 files changed, 140 insertions(+), 136 deletions(-) diff --git a/list.txt b/list.txt index 7ec8c813..53ee6a1c 100644 --- a/list.txt +++ b/list.txt @@ -1,7 +1,3 @@ #src\main\resources\egovframework\egovProps\globals.properties -# 일축압축 첨부파일 하나 씩 올리면 에러나는 버그 -src\main\webapp\WEB-INF\views\web\input\sand\unconfined_usual.jsp -src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp - -# 검색유통 사업 검색 -src\main\java\geoinfo\map\projectSearch\MapProjectSearchController.java +# 일축압축 첨부 파일 하나 씩 올리면 에러나는 버그 수정중.. 2025-01-06 18:01 +src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp \ No newline at end of file diff --git a/src/main/java/geoinfo/regi/projectList/ProjectListController.java b/src/main/java/geoinfo/regi/projectList/ProjectListController.java index bf95a8fc..0f2395ad 100644 --- a/src/main/java/geoinfo/regi/projectList/ProjectListController.java +++ b/src/main/java/geoinfo/regi/projectList/ProjectListController.java @@ -309,9 +309,10 @@ public class ProjectListController { return "/web/index_db"; } - // 지반정보등록 (관리자) + // 지반정보등록 (관리자 및 사용자) @RequestMapping(value = "/checkList.do") public ModelAndView checkList(@RequestParam HashMap params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{ + request.setCharacterEncoding("euc-kr"); String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID")); model.addObject("userId", LoginUserId); @@ -359,117 +360,117 @@ public class ProjectListController { params.put("PROJECT_CODE", p_code); //프로젝트명, 측선수, 시추공수 - result = masterService.getInfo(params); - model.addObject("result", result); - //메타정보 - arrayMeta = masterService.getProjectMetaInfo(params); - model.addObject("arrayMeta", arrayMeta); - //프로젝트정보 - arrayProject = masterService.getProjectInfo(params); - model.addObject("arrayProject", arrayProject); + result = masterService.getInfo(params); + model.addObject("result", result); + //메타정보 + arrayMeta = masterService.getProjectMetaInfo(params); + model.addObject("arrayMeta", arrayMeta); + //프로젝트정보 + arrayProject = masterService.getProjectInfo(params); + model.addObject("arrayProject", arrayProject); - //지형지질정보 - arrayTopo = masterService.getTopoGeology(params); - model.addObject("arrayTopo", arrayTopo); + //지형지질정보 + arrayTopo = masterService.getTopoGeology(params); + model.addObject("arrayTopo", arrayTopo); - //시추공정보 - arrayHeader = masterService.getHeader(params); - model.addObject("arrayHeader", arrayHeader); + //시추공정보 + arrayHeader = masterService.getHeader(params); + model.addObject("arrayHeader", arrayHeader); - //지층정보 - arrayLayer = masterService.getLayerInfo(params); - model.addObject("arrayLayer", arrayLayer); + //지층정보 + arrayLayer = masterService.getLayerInfo(params); + model.addObject("arrayLayer", arrayLayer); - //표준관입시험 - arraySpt = masterService.getSpt(params); - model.addObject("arraySpt", arraySpt); + //표준관입시험 + arraySpt = masterService.getSpt(params); + model.addObject("arraySpt", arraySpt); - //TCRRQD - arrayRqd = masterService.getRqd(params); - model.addObject("arrayRqd", arrayRqd); + //TCRRQD + arrayRqd = masterService.getRqd(params); + model.addObject("arrayRqd", arrayRqd); - //DSF - arrayDsf = masterService.getDsf(params); - model.addObject("arrayDsf", arrayDsf); + //DSF + arrayDsf = masterService.getDsf(params); + model.addObject("arrayDsf", arrayDsf); - //공내재하 - arrayMeter = masterService.getFieldPressuremeter(params); - model.addObject("arrayMeter", arrayMeter); + //공내재하 + arrayMeter = masterService.getFieldPressuremeter(params); + model.addObject("arrayMeter", arrayMeter); - //절리정보 - arraySlick = masterService.getSlickensideInfo(params); - model.addObject("arraySlick", arraySlick); + //절리정보 + arraySlick = masterService.getSlickensideInfo(params); + model.addObject("arraySlick", arraySlick); - //Q - arrayQ = masterService.getQ(params); - model.addObject("arrayQ", arrayQ); + //Q + arrayQ = masterService.getQ(params); + model.addObject("arrayQ", arrayQ); - //RMR - arrayRmr = masterService.getRmr(params); + //RMR + arrayRmr = masterService.getRmr(params); - //현장수압 - arrayWater = masterService.getFieldWaterpressure(params); + //현장수압 + arrayWater = masterService.getFieldWaterpressure(params); - //현장투수 - arrayPer = masterService.getFieldPermeability(params); + //현장투수 + arrayPer = masterService.getFieldPermeability(params); - //콘관입 - arrayCone = masterService.getConePenetration(params); + //콘관입 + arrayCone = masterService.getConePenetration(params); - //기본물성시험 - arraySample = masterService.getSampleInfo(params); - model.addObject("arraySample", arraySample); + //기본물성시험 + arraySample = masterService.getSampleInfo(params); + model.addObject("arraySample", arraySample); - //토사 - 압밀시험 - arrayConsolidation = masterService.getConsolidation(params); + //토사 - 압밀시험 + arrayConsolidation = masterService.getConsolidation(params); - //토사 - 공진주 - arrayResonant = masterService.getResonant(params); + //토사 - 공진주 + arrayResonant = masterService.getResonant(params); - //토사 - 반복삼축 - arrayRT = masterService.getRepeatedTriaxial(params); + //토사 - 반복삼축 + arrayRT = masterService.getRepeatedTriaxial(params); - //암석 - 일축압축 - arrayRockUniaxial = masterService.getRockUniaxial(params); + //암석 - 일축압축 + arrayRockUniaxial = masterService.getRockUniaxial(params); - //암석 - 삼축압축 - arrayRockTriaxial = masterService.getRockTriaxial(params); + //암석 - 삼축압축 + arrayRockTriaxial = masterService.getRockTriaxial(params); - //암석 - 점하중 - arrayRockPointload = masterService.getRockPointload(params); + //암석 - 점하중 + arrayRockPointload = masterService.getRockPointload(params); - //암석 - 절리면전단 - arrayRockJointshear = masterService.getRockJointshear(params); + //암석 - 절리면전단 + arrayRockJointshear = masterService.getRockJointshear(params); - //암석 - 공진주 - arrayRockResonant = masterService.getRockResonant(params); + //암석 - 공진주 + arrayRockResonant = masterService.getRockResonant(params); - //암석 - 반복삼축 - arrayRockRT = masterService.getRockRepeatedTriaxial(params); + //암석 - 반복삼축 + arrayRockRT = masterService.getRockRepeatedTriaxial(params); - //PS검층 - arrayBorehole = masterService.getBorehole(params); + //PS검층 + arrayBorehole = masterService.getBorehole(params); - //하향식 탄성파 - arrayDownhole = masterService.getDownhole(params); + //하향식 탄성파 + arrayDownhole = masterService.getDownhole(params); - //밀도검층 - arrayDensity = masterService.getDensity(params); + //밀도검층 + arrayDensity = masterService.getDensity(params); - //전기비저항 - arrayResistivity = masterService.getResistivity(params); + //전기비저항 + arrayResistivity = masterService.getResistivity(params); - //굴절법탄성파 - arrayRefraction = masterService.getRefraction(params); + //굴절법탄성파 + arrayRefraction = masterService.getRefraction(params); - //전문가의견 - arrayExpert = masterService.getExpertOpinion(params); + //전문가의견 + arrayExpert = masterService.getExpertOpinion(params); - EgovMap sampleInfoExYn = headerService.sampleInfoException(params); - sampleInfoExYn.put("sampleInfoException", (sampleInfoExYn.get("sampleInfoException") != null) ? sampleInfoExYn.get("sampleInfoException") : "N"); - model.addObject("sampleInfoExYn", sampleInfoExYn); - model.addObject("arrayExpert", arrayExpert); - model.setViewName("/web/project/checklist"); + EgovMap sampleInfoExYn = headerService.sampleInfoException(params); + sampleInfoExYn.put("sampleInfoException", (sampleInfoExYn.get("sampleInfoException") != null) ? sampleInfoExYn.get("sampleInfoException") : "N"); + model.addObject("sampleInfoExYn", sampleInfoExYn); + model.addObject("arrayExpert", arrayExpert); + model.setViewName("/web/project/checklist"); return model; } diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml index 642bcc81..13cf7645 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml @@ -28,19 +28,17 @@ diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml index bf9b9d0f..52370ab6 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml @@ -659,17 +659,19 @@ - diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml index e34392d7..4adb37d1 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml @@ -28,14 +28,13 @@ TBL_CLASS_DETAIL A, TBL_PROJECT_INFO B WHERE NVL(B.USE_YN,' ') <> 'N' AND A.CLASS_DETAIL_CODE = B.CLASS_CODE - + ]]> AND B.PROJECT_MASTER_COMPANY_CODE = #{masterCode} GROUP BY A.CLASS_DETAIL_NAME , A.CLASS_DETAIL_CODE ORDER BY A.CLASS_DETAIL_CODE - ]]> m (케이싱심도 ≤ 굴진심도) + m (케이싱심도 ≤ 굴진심도) [값이 없는 경우, - (하이픈) 입력] diff --git a/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp b/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp index 954bc317..0ee0bf30 100644 --- a/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp @@ -162,12 +162,22 @@ function fn_save(rUrl){ fn_fileTotalCheck(fileImgID2); } + if( fileImgBkCheck1 && fileImgCheck1 ) { + alert("파괴형태 그림 첨부는 필수입니다."); + return false; + } else if( fileImgBkCheck2 && fileImgCheck2 ) { + alert("Stress-Strain 그래프 첨부는 필수입니다."); + return false; + } + /* if(fileImgCheck1 === true || fileImgCheck2 === true){ if (fileImgBkCheck1 === true || fileImgBkCheck2 === true){ + alert("그래프 업로드는 필수입니다."); return false; } } + */ /* if(fileImgBkCheck1 === true || fileImgBkCheck2 === true){ */ /* } */ //그리드 저장 diff --git a/src/main/webapp/web/preview/HOLE.reb b/src/main/webapp/web/preview/HOLE.reb index aad259626933907e4be0a4a0f3a38c3bb582333e..bfaa14c9460a91ff23ceddac5bd78f72da5b1e29 100644 GIT binary patch delta 4260 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 ~1^RbkQRa*YhPTc(iZ213|N%zq%P)tMhm zT+*LEIfowG^>-auhn-gJ$|8dY&~5ol^HP)k;t0|b7LgIwAR)uG`y;ST5+fngX;V3-v- j@z*8=v|>K5u+cuRuq!