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 aad25962..bfaa14c9 100644 Binary files a/src/main/webapp/web/preview/HOLE.reb and b/src/main/webapp/web/preview/HOLE.reb differ