diff --git a/list.txt b/list.txt index aa1ed78c..96885196 100644 --- a/list.txt +++ b/list.txt @@ -1,13 +1,2 @@ #src\main\resources\egovframework\egovProps\globals.properties -src\main\webapp\WEB-INF\views\visitEducationApplication\inquiry\visitEducationApplicationInquiry.jsp -src\main\webapp\com\css\common.v2.0.css -src\main\webapp\com\img\visitEducationApplication\chevron.svg -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Light.woff -src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Light.woff2 -#'입력중인프로젝트 현황'에서 '검수등록대기 목록'으로 이동 기능 추가 -src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp -src\main\java\geoinfo\regi\listReg\ListRegController.java -src\main\java\geoinfo\regi\listReg\service\ListRegService.java -src\main\java\geoinfo\regi\listReg\service\impl\ListRegServiceImpl.java -src\main\java\geoinfo\regi\listReg\service\ListRegMapper.java -src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml \ No newline at end of file +src\main\webapp\web\service\SAMPLE.reb \ No newline at end of file diff --git a/src/main/java/geoinfo/com/WebConfirm.java b/src/main/java/geoinfo/com/WebConfirm.java index 145c0e40..9dbbb49d 100644 --- a/src/main/java/geoinfo/com/WebConfirm.java +++ b/src/main/java/geoinfo/com/WebConfirm.java @@ -27,18 +27,17 @@ public class WebConfirm WebUtil wUtil = new WebUtil(); - String user = "geoinfo"; - String pw = "geoinfo"; - //String pw = "dbnt060928!rlaxogh"; + //String user = "geoinfo"; + //String pw = "geoinfo"; //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl"; /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/ //String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버 - String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 + //String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버 //String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버 - public String thkimTestOracleUrl = EgovProperties.getProperty("Oracle.Url"); - public String thkimTestOracleId = EgovProperties.getProperty("Oracle.ID"); - public String thkimTestOraclePassword = EgovProperties.getProperty("Oracle.Password"); + String url = EgovProperties.getProperty("Oracle.Url").trim(); + String user = EgovProperties.getProperty("Oracle.ID").trim(); + String pw = EgovProperties.getProperty("Oracle.Password").trim(); /* * public WebConfirm() { this.connection = null; this.connectionPool = null; @@ -47,16 +46,20 @@ public class WebConfirm */ public boolean ConfirmProject(HttpServletRequest request, final String PROJECT_CODE) { - System.out.println( - "\n--------------------------------------------------------------\n" + - request.getRequestURI() + " " + " ConfirmProject" + - "\n--------------------------------------------------------------\n" + - "thkimTestOracleUrl:[" + thkimTestOracleUrl + "]\n" + - "thkimTestOracleId:[" + thkimTestOracleId + "]\n" + - "thkimTestOraclePassword:[" + thkimTestOraclePassword + "]\n" + - "\n--------------------------------------------------------------\n" - ); + if( url == null || url.isEmpty() || user == null || user.isEmpty() || pw == null || pw.isEmpty() ) { + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " " + " ConfirmProject" + + "\n--------------------------------------------------------------\n" + + "url:[" + (url == null || url.isEmpty()) + "]\n" + + "user:[" + (user == null || user.isEmpty()) + "]\n" + + "pw:[" + (pw == null || pw.isEmpty()) + "]\n" + + "\n--------------------------------------------------------------\n" + ); + + } + try { Class.forName("oracle.jdbc.driver.OracleDriver"); connection = DriverManager.getConnection(url,user,pw); diff --git a/src/main/java/geoinfo/main/community/CommunityController.java b/src/main/java/geoinfo/main/community/CommunityController.java index cd257c8d..b6801fe5 100644 --- a/src/main/java/geoinfo/main/community/CommunityController.java +++ b/src/main/java/geoinfo/main/community/CommunityController.java @@ -295,11 +295,11 @@ public class CommunityController { @RequestMapping(value = "/cmuboard_read.do") public ModelAndView cmuboard_read(@RequestParam Map params, HttpServletRequest request, HttpServletResponse response, @RequestParam("id") int id) throws Exception { ModelAndView mv = new ModelAndView("body/cmuboard/cmuboard_read"); - + Map result = communityService.selectContent(id); - + if (result != null) { - if ((result.get("email") != null && result.get("name") != null)) { + if ( false && (result.get("email") != null && result.get("name") != null)) { mv.addObject("EM", "" + result.get("name") + ""); } else { mv.addObject("EM", result.get("name")); diff --git a/src/main/java/geoinfo/regi/header/HeaderController.java b/src/main/java/geoinfo/regi/header/HeaderController.java index 924b1c0d..41fb6a14 100644 --- a/src/main/java/geoinfo/regi/header/HeaderController.java +++ b/src/main/java/geoinfo/regi/header/HeaderController.java @@ -779,6 +779,11 @@ public class HeaderController { //INSERT TEMP_HEADER } + + //케이싱심도의 -(hyphen 값 입력을 허용한다. 케이싱심도값이 없는 경우, -999로 변환하여 저장한다. 왜냐하면 케이싱심도가 저장되는 column이 숫자만 들어가기 때문이다. + if( oHOLE_CASING_DEPTH.equals("-") ) { + oHOLE_CASING_DEPTH = "-999"; + } //PARAM SET params.put("PROJECT_CODE",oPROJECT_CODE ); diff --git a/src/main/java/geoinfo/regi/info/InfoController.java b/src/main/java/geoinfo/regi/info/InfoController.java index c3a5ed64..45142be0 100644 --- a/src/main/java/geoinfo/regi/info/InfoController.java +++ b/src/main/java/geoinfo/regi/info/InfoController.java @@ -422,7 +422,12 @@ public class InfoController { } } - + + if (oPROJECT_CODE != null && "".equals(oPROJECT_CODE) == false && oPROJECT_HOLE_NUMBER != null && "".equals(oPROJECT_HOLE_NUMBER) == false ) { + params.put("PROJECT_CODE", oPROJECT_CODE); + params.put("HOLE_NUMBER", oPROJECT_HOLE_NUMBER); + int nReturn = infoService.updateMetaHoleNumber(params); + } model.put("msg", "저장 성공"); } catch (ParseException e) { model.put("msg", "저장 실패"); diff --git a/src/main/java/geoinfo/regi/info/service/InfoMapper.java b/src/main/java/geoinfo/regi/info/service/InfoMapper.java index 04f52cc0..88e314d2 100644 --- a/src/main/java/geoinfo/regi/info/service/InfoMapper.java +++ b/src/main/java/geoinfo/regi/info/service/InfoMapper.java @@ -42,7 +42,10 @@ public interface InfoMapper { void updateTempExpertOpinion(HashMap params) throws Exception; - List getGDisCode(Map params); + List getGDisCode(Map params); + + int updateMetaHoleNumber(HashMap params) throws Exception; + } diff --git a/src/main/java/geoinfo/regi/info/service/InfoService.java b/src/main/java/geoinfo/regi/info/service/InfoService.java index 6a40469d..4dabc7b7 100644 --- a/src/main/java/geoinfo/regi/info/service/InfoService.java +++ b/src/main/java/geoinfo/regi/info/service/InfoService.java @@ -42,5 +42,7 @@ public interface InfoService { void updateTempExpertOpinion(HashMap params) throws Exception; List getGDisCode(Map params); + + public int updateMetaHoleNumber(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java b/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java index d90a426a..21f7b48b 100644 --- a/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java +++ b/src/main/java/geoinfo/regi/info/service/impl/InfoServiceImpl.java @@ -103,4 +103,11 @@ public class InfoServiceImpl implements InfoService { public List getGDisCode(Map params) { return infoMapper.getGDisCode(params); } + + + @Override + public int updateMetaHoleNumber(HashMap params) throws Exception { + return infoMapper.updateMetaHoleNumber(params); + } + } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml index 2f70a337..662f0cdc 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml @@ -276,4 +276,15 @@ AND DISTRICT = #{gdis} + + UPDATE + TEMP_META_INFO + SET + HOLE_NUMBER = #{HOLE_NUMBER} + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/web/index.jsp b/src/main/webapp/WEB-INF/views/web/index.jsp index 3424c17a..a301da35 100644 --- a/src/main/webapp/WEB-INF/views/web/index.jsp +++ b/src/main/webapp/WEB-INF/views/web/index.jsp @@ -247,14 +247,6 @@ function fn_help_tour(){ title:'Step 2', content: '프로젝트 목록이 조회 되며, 프로젝트명을 클릭하시면 해당 프로젝트를 조회 또는 입력하실 수 있습니다. ', target:'grid' - },{ - title:'Step 3', - content: '엑셀 업로드버튼을 클릭하시면 엑셀자료입력 페이지로 이동하여 표준 엑셀서식에 한꺼번에 작성하여 업로드하실 수 있습니다.', - target:'excel-btn' - },{ - title:'Step 4', - content: 'Font Download 버튼을 클릭하여 폰트를 컴퓨터에 설치하시면 입력서식의 폰트를 자연스럽게 보실 수 있습니다.', - target:'font-download' }], }); return false; @@ -352,9 +344,6 @@ function fn_help_tour(){
Total : ${fn:length(result)} 건
- diff --git a/src/main/webapp/WEB-INF/views/web/input/header.jsp b/src/main/webapp/WEB-INF/views/web/input/header.jsp index 4b58eb9d..dff7731e 100644 --- a/src/main/webapp/WEB-INF/views/web/input/header.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/header.jsp @@ -114,9 +114,11 @@ function fn_save(rUrl){ if ($('#HOLE_TOTAL_DEPTH').val() && $('#HOLE_CASING_DEPTH').val()) { var _totalDepth = $('#HOLE_TOTAL_DEPTH').val(); var _casingDepth = $('#HOLE_CASING_DEPTH').val(); - + if( _casingDepth === '-' ) { + _casingDepth = -999; + } _totalDepth = parseFloat(_totalDepth); - _casingDepth = parseFloat(_casingDepth); + _casingDepth = Number(parseFloat(_casingDepth)); if (_totalDepth < _casingDepth) { alert('케이싱심도가 굴진심도보다 큽니다.'); @@ -138,11 +140,16 @@ function fn_save(rUrl){ {"id":"HOLE_LONG_M", "start_num":2, "end_num":0}, {"id":"HOLE_LONG_S", "start_num":2, "end_num":2}, {"id":"HOLE_TOTAL_DEPTH", "start_num":8, "end_num":2}, - {"id":"HOLE_CASING_DEPTH", "start_num":8, "end_num":2}, {"id":"HOLE_LAYER_NUM", "start_num":10, "end_num":0}, {"id":"HOLE_WL", "start_num":8, "end_num":2} ]; + if( _casingDepth !== -999) { + colInfo.push( + {"id":"HOLE_CASING_DEPTH", "start_num":8, "end_num":2} + ); + + } if(fn_saveNumberCheckHTML(colInfo) == false)return false; //표고, 지하수위 (음수 입력 가능) @@ -356,6 +363,20 @@ function is_checked(){ } +function casingDepthKeyupValidator() { + //케이싱심도 유효성 체크 + var holeCasingDepth = document.getElementById("HOLE_CASING_DEPTH"); + + holeCasingDepth.addEventListener("keyup", function(event) { + if (!(event.keyCode >= 37 && event.keyCode <= 40)) { + var inputVal = this.value.trim(); + if (inputVal !== '-') { + this.value = inputVal.replace(/[^0-9.]/gi, ''); + } + } + }); +} + window.onload = function() { if("${param.MAP_CFRM_YN}" == "Y"){ @@ -375,12 +396,13 @@ window.onload = function() { fn_onkeyNumber("HOLE_EL", "float02"); fn_onkeyNumber("HOLE_WL", "float"); fn_onkeyNumber("HOLE_TOTAL_DEPTH", "float"); - fn_onkeyNumber("HOLE_CASING_DEPTH", "float"); fn_onkeyNumber("HOLE_LAYER_NUM", "int"); fn_onkeyNumber("PROJECT_START_DATE", "int"); fn_onkeyNumber("PROJECT_START_DATE", "int"); fn_onkeyNumber("PROJECT_START_DATE", "int"); + casingDepthKeyupValidator(); + /* //지자체'L_DIS','M_DIS' if('${sd}' != null && '${sd}' != ''){ @@ -1479,7 +1501,7 @@ function fn_HoleLoad(){ 케이싱심도(m) (-) : - m (케이싱심도 ≤ 굴진심도) + m (케이싱심도 ≤ 굴진심도) diff --git a/src/main/webapp/web/preview/HOLE.reb b/src/main/webapp/web/preview/HOLE.reb index 06c20fb1..aad25962 100644 Binary files a/src/main/webapp/web/preview/HOLE.reb and b/src/main/webapp/web/preview/HOLE.reb differ diff --git a/src/main/webapp/web/service/HOLE.reb b/src/main/webapp/web/service/HOLE.reb index 044683a8..92d4e688 100644 Binary files a/src/main/webapp/web/service/HOLE.reb and b/src/main/webapp/web/service/HOLE.reb differ diff --git a/src/main/webapp/web/service/SAMPLE.reb b/src/main/webapp/web/service/SAMPLE.reb index 15f61401..7319f900 100644 Binary files a/src/main/webapp/web/service/SAMPLE.reb and b/src/main/webapp/web/service/SAMPLE.reb differ