From 4bc15f36da320a31de89ba2e52f505a8d869dbfd Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 6 Jan 2025 19:52:38 +0900 Subject: [PATCH] feat: use_yn change conditions --- list.txt | 13 +- src/main/java/geoinfo/com/WebConfirm.java | 12 +- .../MapProjectSearchController.java | 8 + .../regi/complete/CompleteController.java | 18 ++ .../regi/surface/SurfaceController.java | 4 +- .../sqlmap/mapper/com/Jusangdo_SQL.xml | 4 +- .../sqlmap/mapper/main/Home_SQL.xml | 21 ++- .../sqlmap/mapper/main/Login_SQL.xml | 10 +- .../sqlmap/mapper/map/MapControl_SQL.xml | 59 ++++--- .../sqlmap/mapper/map/MapCoordSearch_SQL.xml | 11 +- .../sqlmap/mapper/map/MapInformation_SQL.xml | 43 +++-- .../sqlmap/mapper/map/MapLeft_SQL.xml | 73 ++++---- .../sqlmap/mapper/map/MapMain_SQL.xml | 4 +- .../mapper/map/MapProjectSearch_SQL.xml | 159 +++++++++--------- .../sqlmap/mapper/regi/common.xml | 12 +- .../sqlmap/mapper/regi/complete.xml | 2 +- .../sqlmap/mapper/regi/complete_SQL.xml | 8 +- .../sqlmap/mapper/regi/header.xml | 24 +-- .../sqlmap/mapper/regi/holeCoord.xml | 6 +- .../sqlmap/mapper/regi/info_SQL.xml | 4 +- .../sqlmap/mapper/regi/layerInfo_SQL.xml | 4 +- .../sqlmap/mapper/regi/listReg.xml | 8 +- .../sqlmap/mapper/regi/manageList.xml | 2 +- .../sqlmap/mapper/regi/manageList2019.xml | 4 +- .../egovframework/sqlmap/mapper/regi/map.xml | 8 +- .../sqlmap/mapper/regi/projectList.xml | 70 ++++---- .../egovframework/sqlmap/mapper/regi/regi.xml | 38 +++-- .../egovframework/sqlmap/mapper/regi/rock.xml | 2 +- .../sqlmap/mapper/regi/sand_SQL.xml | 4 +- .../mapper/regi/selectClass2019_SQL.xml | 28 +-- .../sqlmap/mapper/regi/selectClass_SQL.xml | 4 +- .../sqlmap/mapper/regi/surface_SQL.xml | 4 +- 32 files changed, 387 insertions(+), 284 deletions(-) diff --git a/list.txt b/list.txt index 88e36d9e..7ec8c813 100644 --- a/list.txt +++ b/list.txt @@ -1,8 +1,7 @@ #src\main\resources\egovframework\egovProps\globals.properties -# 아이디 찾기 시 이메일 주소 생략 -src\main\webapp\WEB-INF\views\body\account\main.jsp -src\main\webapp\WEB-INF\views\body\account\idNotFind.jsp -src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml -src\main\java\geoinfo\main\login\service\LoginMapper.java -src\main\java\geoinfo\main\login\service\impl\LoginServiceImpl.java -src\main\java\geoinfo\main\login\LoginController.java \ No newline at end of file +# 일축압축 첨부파일 하나 씩 올리면 에러나는 버그 +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 diff --git a/src/main/java/geoinfo/com/WebConfirm.java b/src/main/java/geoinfo/com/WebConfirm.java index 82c6f5f1..d4628b48 100644 --- a/src/main/java/geoinfo/com/WebConfirm.java +++ b/src/main/java/geoinfo/com/WebConfirm.java @@ -167,7 +167,7 @@ public class WebConfirm sql += " PROJECT_LANGE,"; sql += " PROJECT_START_SPOT_SD||PROJECT_START_SPOT_SGG||PROJECT_START_SPOT PROJECT_START_SPOT,"; sql += " PROJECT_END_SPOT_SD||PROJECT_END_SPOT_SGG||PROJECT_END_SPOT PROJECT_END_SPOT"; - sql += " FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE] "; + sql += " FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE] "; resultCnt += exeQuery(sql, PROJECT_CODE); exeQuery(sql = "DELETE FROM TBL_TOPO_GEOLOGY WHERE PROJECT_CODE = [PROJECT_CODE]", PROJECT_CODE); System.out.println( @@ -208,7 +208,7 @@ public class WebConfirm - sql = "SELECT PROJECT_CODE, HOLE_CODE, HOLE_LOCATION_X AS X, HOLE_LOCATION_Y AS Y FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]"; + sql = "SELECT PROJECT_CODE, HOLE_CODE, HOLE_LOCATION_X AS X, HOLE_LOCATION_Y AS Y FROM TEMP_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE]"; (query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", PROJECT_CODE); resultSet = query.execute(connection); System.out.println( @@ -296,7 +296,7 @@ public class WebConfirm sql = sql + " \n " + map.get("Y").toString() + ", "; sql += " \n HOLE_OR_X,"; sql += " \n HOLE_OR_Y "; - sql += " \n FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]"; + sql += " \n FROM TEMP_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE]"; sql += " \n AND HOLE_CODE = [HOLE_CODE]"; (query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", PROJECT_CODE); query.setParam("HOLE_CODE", resultSet.getString("HOLE_CODE")); @@ -373,7 +373,7 @@ public class WebConfirm sbQuery.append(" , SYSDATE "); sbQuery.append(" FROM TBL_PROJECT_INFO A "); sbQuery.append(" , TBL_HEADER B "); - sbQuery.append(" WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE "); + sbQuery.append(" WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE "); sbQuery.append(" AND B.HOLE_CODE = [HOLE_CODE] "); (query = new DatabaseQuery(sbQuery.toString())).setParam("HOLE_CODE", resultSet.getString("HOLE_CODE")); resultCnt += query.executeUpdate(connection); @@ -1693,7 +1693,7 @@ public class WebConfirm public String getProjectInfo(final String project_code, final String col_name) throws SQLException { String sql = ""; String column_value = ""; - sql = "SELECT * FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]"; + sql = "SELECT * FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE]"; (query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", project_code); resultSet = query.execute(connection); if (resultSet.next()) { @@ -1707,7 +1707,7 @@ public class WebConfirm String value = ""; sql += " \n SELECT "; sql += " \n FUNC_MASTER_COMPANY_NAME(PROJECT_MASTER_COMPANY_O_CODE, PROJECT_MASTER_COMPANY_TW_CODE, PROJECT_MASTER_COMPANY_TH_CODE, PROJECT_MASTER_COMPANY_F_CODE,PROJECT_MASTER_COMPANY_NAME) AS COMPANY "; - sql += " \n FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]"; + sql += " \n FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE]"; (query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", project_code); resultSet = query.execute(connection); if (resultSet.next()) { diff --git a/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java b/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java index 64c63722..cdfecade 100644 --- a/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java +++ b/src/main/java/geoinfo/map/projectSearch/MapProjectSearchController.java @@ -218,6 +218,14 @@ public class MapProjectSearchController { //pname = pname.replaceAll(" ", ""); params.put("pname", pname); + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "pname: [" + pname + "]\n" + + "\n--------------------------------------------------------------\n" + ); if (params.get("page")!= null) { pageIndex = Integer.parseInt(GeoinfoCommon.parseData(String.valueOf(params.get("page")))); // 현재페이지번호 diff --git a/src/main/java/geoinfo/regi/complete/CompleteController.java b/src/main/java/geoinfo/regi/complete/CompleteController.java index fff7b7d6..243325b5 100644 --- a/src/main/java/geoinfo/regi/complete/CompleteController.java +++ b/src/main/java/geoinfo/regi/complete/CompleteController.java @@ -81,9 +81,27 @@ public class CompleteController { // 관리자 아닐 경우 back(); if (!request.getSession().getAttribute("CLS").equals("9")) { + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN: You are not administrator!!!!" + + "\n--------------------------------------------------------------\n" + + "params.toString()" + params.toString() + "\n" + + "\n--------------------------------------------------------------\n" + ); return ""; } + + + System.out.println( + "\n--------------------------------------------------------------\n" + + request.getRequestURI() + " IN:" + + "\n--------------------------------------------------------------\n" + + "params.toString()" + params.toString() + "\n" + + "\n--------------------------------------------------------------\n" + ); + try { String LoginUserId = String.valueOf(request.getSession().getAttribute("USERID")); params.put("LoginUserId", LoginUserId); diff --git a/src/main/java/geoinfo/regi/surface/SurfaceController.java b/src/main/java/geoinfo/regi/surface/SurfaceController.java index 5c3fc097..84d9b361 100644 --- a/src/main/java/geoinfo/regi/surface/SurfaceController.java +++ b/src/main/java/geoinfo/regi/surface/SurfaceController.java @@ -162,7 +162,7 @@ public class SurfaceController { // // **************************************프로젝트정보의 // 측선수**************************************// - strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]"; + strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE]"; Map result = surfaceService.selectTempProjectInfo(params); @@ -921,7 +921,7 @@ public class SurfaceController { // // **************************************프로젝트정보의 // 측선수**************************************// - strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]"; + strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = [PROJECT_CODE]"; Map result = surfaceService.selectTempProjectInfo(params); if (result != null) { diff --git a/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml index 6cbb5161..127c108e 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/com/Jusangdo_SQL.xml @@ -3,9 +3,11 @@ \ No newline at end of file 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 9053147f..642bcc81 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml @@ -28,10 +28,11 @@ @@ -128,7 +130,7 @@ + 'N' AND PROJECT_CODE IN ( SELECT PROJECT_CODE FROM POP_PROJECT_INFO WHERE PROJECT_MASTER_COMPANY_CODE NOT IN @@ -150,6 +153,7 @@ ${code} ) ) + ]]> @@ -200,21 +204,22 @@ 'N' AND PROJECT_START_DATE IS NOT NULL GROUP BY SUBSTR(PROJECT_START_DATE, 1, 4) ORDER BY YEAR ]]> - + 'N' AND PROJECT_CODE = #{pcode} ]]> 'N' AND TRIM(PROJECT_CODE) = TRIM(A.METADATAID)) AS PROJECTNAME, (SELECT NAME FROM WEB_DOWNLOAD_PURPOSE WHERE TRIM(CODE) = TRIM(A.PURPOSE_CODE)) AS PURNAME, A.PURPOSE_ETC, A.SUBJECT, TO_CHAR(A.STARTDATE, 'YYYY-MM-DD') STARTDATE, TO_CHAR(A.ENDDATE, 'YYYY-MM-DD') ENDDATE, A.APPROVE, A.APPROVEDATE, (SELECT NAME FROM WEB_DOWN_CANCEL WHERE TRIM(CODE) = TRIM(A.CANCEL_REASON)) AS CANCEL_REASON, A.CANCEL_ETC, A.USE_CONTENTS, @@ -300,7 +300,7 @@ @@ -528,8 +528,8 @@ 'N' + WHERE NVL(A.USE_YN,' ') <> 'N' AND A.LOCATION_EXCEPTION = 'Y' GROUP BY ROWNUM, B.PROJECT_CODE, B.PROJECT_NAME ORDER BY PROJECT_CODE ]]> diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml index 4dee5a46..4f81a622 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapControl_SQL.xml @@ -12,11 +12,11 @@ FROM TBL_PROJECT_INFO WHERE - USE_YN != 'N' AND TRIM(PROJECT_CODE) IN + NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) IN ( SELECT TRIM(PROJECT_CODE) FROM TBL_HEADER A - WHERE A.USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} + WHERE NVL(A.USE_YN,' ') <> 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY} ]]> @@ -55,11 +55,11 @@ FROM TBL_PROJECT_INFO WHERE - USE_YN != 'N' AND + NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) IN( SELECT TRIM(PROJECT_CODE) FROM TBL_HEADER A - WHERE A.USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} + WHERE NVL(A.USE_YN,' ') <> 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY} ]]> @@ -92,14 +92,14 @@ FROM TBL_PROJECT_INFO WHERE - USE_YN != 'N' AND + NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) IN ( SELECT TRIM(PROJECT_CODE) FROM tbl_header where - USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) + NVL(USE_YN,' ') <> 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) ) ) A, ( @@ -130,14 +130,14 @@ FROM TBL_PROJECT_INFO WHERE - USE_YN != 'N' AND + NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) IN( SELECT TRIM(PROJECT_CODE) FROM tbl_header where - USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) + NVL(USE_YN,' ') <> 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) ) ) A, ( @@ -186,6 +186,7 @@ @@ -670,7 +683,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml index 4e63b738..2f438ddc 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml @@ -12,8 +12,9 @@ FROM TBL_PROJECT_INFO A, TBL_HEADER B WHERE - A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE - + 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + ]]> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND + ]]> + A.PROJECT_CODE = B.PROJECT_CODE - where USE_YN != 'N' AND HOLE_CODE IN + 'N' AND HOLE_CODE IN + ]]> #{hole} = #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} + WHERE NVL(USE_YN,' ') <> 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY} ]]> @@ -32,14 +34,16 @@ ]]> - where USE_YN != 'N' AND HOLE_CODE IN + 'N' AND HOLE_CODE IN + ]]> #{hole} = #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} + WHERE NVL(USE_YN,' ') <> 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY} ]]> @@ -55,8 +59,10 @@ FROM TBL_HEADER A, TBL_PROJECT_INFO B WHERE - B.USE_YN != 'N' AND - A.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + 'N' AND NVL(B.USE_YN,' ') <> 'N' AND + ]]> + A.PROJECT_CODE = B.PROJECT_CODE AND A.HOLE_CODE IN #{hole} @@ -99,8 +105,10 @@ TBL_PROJECT_INFO A , TBL_HEADER B WHERE - A.USE_YN != 'N' AND - B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + 'N' AND NVL(B.USE_YN,' ') <> 'N' AND + ]]> + A.PROJECT_CODE = B.PROJECT_CODE 'N' AND NVL(B.USE_YN,' ') <> 'N' AND + ]]> TRIM(A.HOLE_CODE) = (#{holeCode}) AND A.PROJECT_CODE = B.PROJECT_CODE @@ -285,7 +294,8 @@ TBL_HEADER A, TBL_PROJECT_INFO B WHERE - A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND + A.PROJECT_CODE = B.PROJECT_CODE AND A.HOLE_CODE IN ]]> @@ -300,7 +310,7 @@ ( SELECT TRIM(HOLE_CODE) FROM TBL_HEADER A - WHERE A.USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} + WHERE NVL(A.USE_YN,' ') <> 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY} ) ]]> @@ -331,7 +341,8 @@ FROM (SELECT ROWNUM RNK, FROM TBL_HEADER A, TBL_PROJECT_INFO B WHERE - A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND + A.PROJECT_CODE = B.PROJECT_CODE AND A.HOLE_CODE IN ]]> @@ -347,7 +358,7 @@ FROM (SELECT ROWNUM RNK, FROM TBL_HEADER A WHERE - A.USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} + NVL(A.USE_YN,' ') <> 'N' AND HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX} AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY} ) ]]> @@ -378,7 +389,9 @@ FROM (SELECT ROWNUM RNK, FROM TBL_PROJECT_INFO WHERE - USE_YN != 'N' AND + 'N' AND + ]]> TRIM(PROJECT_CODE) IN #{project} 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 3bcbba35..bf9b9d0f 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml @@ -20,7 +20,7 @@ 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND NVL(A.USE_YN,' ') <> 'N' ]]> @@ -58,7 +58,7 @@ 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND NVL(A.USE_YN,' ') <> 'N' ]]> @@ -107,7 +107,7 @@ FROM tbl_header where - USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) + NVL(USE_YN,' ') <> 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) ) ]]> @@ -118,7 +118,7 @@ FROM tbl_header where - USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) + NVL(USE_YN,' ') <> 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) ) ]]> @@ -158,7 +158,7 @@ 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND NVL(A.USE_YN,' ') <> 'N' ]]> @@ -212,7 +212,7 @@ 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND NVL(A.USE_YN,' ') <> 'N' ]]> @@ -262,7 +262,7 @@ FROM tbl_header where - USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) + NVL(USE_YN,' ') <> 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) ) ]]> @@ -273,7 +273,7 @@ FROM tbl_header where - USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) + NVL(USE_YN,' ') <> 'N' AND ('0',hole_code) IN ( ${sichuHolecode} ) ) ]]> @@ -307,7 +307,7 @@ FROM TBL_PROJECT_INFO A WHERE - A.USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{pcode} + NVL(A.USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) = #{pcode} ]]> @@ -322,14 +322,14 @@ PRO_GOAL, (SELECT MAX(LINE_NUMBER) FROM TBL_REFRACTION_SURVEY_SUB WHERE PROJECT_CODE=#{pcode}) AS REFRACTION_COUNT, (SELECT MAX(LINE_NUMBER) FROM TBL_RESISTIVITY_SURVEY_SUB WHERE PROJECT_CODE=#{pcode}) AS RESISTIVITY_COUNT, - (SELECT MIN(HOLE_LOCATION_TM_X) MINX FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE=#{pcode}) AS MINX, - (SELECT MAX(HOLE_LOCATION_TM_X) MAXX FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE=#{pcode}) AS MAXX, - (SELECT MIN(HOLE_LOCATION_TM_Y) MINY FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE=#{pcode}) AS MINY, - (SELECT MAX(HOLE_LOCATION_TM_Y) MAXY FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE=#{pcode}) AS MAXY + (SELECT MIN(HOLE_LOCATION_TM_X) MINX FROM TBL_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE=#{pcode}) AS MINX, + (SELECT MAX(HOLE_LOCATION_TM_X) MAXX FROM TBL_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE=#{pcode}) AS MAXX, + (SELECT MIN(HOLE_LOCATION_TM_Y) MINY FROM TBL_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE=#{pcode}) AS MINY, + (SELECT MAX(HOLE_LOCATION_TM_Y) MAXY FROM TBL_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE=#{pcode}) AS MAXY FROM TBL_PROJECT_INFO A WHERE - A.USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{pcode} + NVL(A.USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) = #{pcode} ]]> @@ -341,7 +341,7 @@ FROM tbl_PROJECT_INFO A, tbl_HEADER B WHERE - A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE (+) + NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE (+) AND A.PROJECT_CODE = #{pcode} AND B.HOLE_CODE = #{hcode} ]]> @@ -355,7 +355,7 @@ PJT.PROJECT_NAME, CASE WHEN (SELECT COM_NAME FROM TBL_MASTER_COMPANY CO WHERE CO.COM_CODE = PJT.PROJECT_MASTER_COMPANY_CODE) IS NULL - THEN (SELECT PROJECT_MASTER_COMPANY_NAME FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = PJT.PROJECT_CODE) + THEN (SELECT PROJECT_MASTER_COMPANY_NAME FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = PJT.PROJECT_CODE) ELSE (SELECT COM_NAME FROM TBL_MASTER_COMPANY CO WHERE CO.COM_CODE = PJT.PROJECT_MASTER_COMPANY_CODE) END AS COMPANY, @@ -397,7 +397,7 @@ HOL.HOLE_CASING_DEPTH, (select case when k.hole_wl_except = 'Y' THEN '지하수위가 심도이하이다' - ELSE replace(hol.hole_wl, '-') END AS hole_wl from temp_header k where k.USE_YN != 'N' AND k.hole_code='{PARAMETER.H_CODE}') + ELSE replace(hol.hole_wl, '-') END AS hole_wl from temp_header k where NVL(k.USE_YN,' ') <> 'N' AND k.hole_code='{PARAMETER.H_CODE}') as hole_wl, HOL.HOLE_BORING_MACHINE, FUNC_COMM_NAME('CM009', HOL.HOLE_BORING_METHOD) HOLE_BORING_METHOD, @@ -434,11 +434,11 @@ WHERE HOLE_CODE = #{hcode} ) SA ) LAYER_PAGE, (CASE WHEN PJT.PROJECT_OFFERING_MATERIALS IS NOT NULL THEN PJT.PROJECT_OFFERING_MATERIALS||' 제공' ELSE '' END) AS PROJECT_OFFERING_MATERIALS FROM TBL_HEADER HOL INNER JOIN TBL_PROJECT_INFO PJT - ON HOL.PROJECT_CODE = PJT.PROJECT_CODE AND PJT.USE_YN != 'N' + ON HOL.PROJECT_CODE = PJT.PROJECT_CODE AND NVL(PJT.USE_YN,' ') <> 'N' LEFT OUTER JOIN TEMP_COORDINATE CRD ON HOL.HOLE_COORDINATE = CRD.COORDINATE_CODE WHERE - HOL.USE_YN != 'N' AND HOL.HOLE_CODE= #{hcode} + NVL(HOL.USE_YN,' ') <> 'N' AND HOL.HOLE_CODE= #{hcode} ]]> @@ -469,7 +469,7 @@ FROM TEMP_RESISTIVITY_SURVEY_SUB A , TBL_PROJECT_INFO B WHERE - B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND TRIM(B.PROJECT_CODE) = #{pcode} ORDER BY LINE_NUMBER , SEQ @@ -489,7 +489,7 @@ FROM TBL_PROJECT_INFO A, TBL_HEADER B WHERE - A.USE_YN != 'N' AND B.USE_YN != 'N' AND TRIM(A.PROJECT_CODE) = TRIM(B.PROJECT_CODE) AND TRIM(B.PROJECT_CODE) = #{pcode} + NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND TRIM(A.PROJECT_CODE) = TRIM(B.PROJECT_CODE) AND TRIM(B.PROJECT_CODE) = #{pcode} ORDER BY HOLE_CODE ]]> @@ -502,7 +502,7 @@ FROM tbl_project_info a WHERE - a.USE_YN != 'N' AND a.project_name LIKE '%'|| #{pName}|| '%' + NVL(A.USE_YN,' ') <> 'N' AND a.project_name LIKE '%'|| #{pName}|| '%' AND ROWNUM <= 10 ]]> @@ -514,7 +514,7 @@ FROM tbl_project_info WHERE - USE_YN != 'N' + NVL(USE_YN,' ') <> 'N' ]]> @@ -654,21 +654,22 @@ FROM TBL_PROJECT_INFO WHERE - USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{projectCode} + NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) = #{projectCode} ]]> 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 7b75760d..e34392d7 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/map/MapMain_SQL.xml @@ -21,12 +21,13 @@ 'N' + TBL_PROJECT_INFO A LEFT OUTER JOIN TBL_HEADER B + ON A.PROJECT_CODE = B.PROJECT_CODE AND NVL(B.USE_YN,' ') <> 'N' + WHERE + NVL(A.USE_YN,' ') <> 'N' ]]> - + = #{startDate} AND SUBSTR(A.PROJECT_START_DATE,0,4) <= #{endDate}) ]]> - + - + - + - + - + AND EXISTS (SELECT 1 FROM TBL_SPT C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_RQD C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_DSF C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_SLICKENSIDE_INFO C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_Q C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_RMR C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_FIELD_PRESSUREMETER C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_FIELD_PERMEABILITY C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_FIELD_WATERPRESSURE C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_ROCK_POINTLOAD C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_ROCK_JOINTSHEAR C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_ROCK_UNIAXIAL C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_ROCK_TRIAXIAL C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + - + AND EXISTS (SELECT 1 FROM ( @@ -128,7 +129,7 @@ ) C WHERE B.hole_code = C.hole_code ) - + AND EXISTS (SELECT 1 FROM ( @@ -142,7 +143,7 @@ ) C WHERE B.hole_code = C.hole_code ) - + AND EXISTS (SELECT 1 FROM ( @@ -156,7 +157,7 @@ ) C WHERE B.hole_code = C.hole_code ) - + AND EXISTS (SELECT 1 FROM ( @@ -170,7 +171,7 @@ ) C WHERE B.hole_code = C.hole_code ) - + AND EXISTS (SELECT 1 FROM ( @@ -184,50 +185,50 @@ ) C WHERE B.hole_code = C.hole_code ) - + AND EXISTS (SELECT 1 FROM TBL_REPEATED_TRIAXIAL_USUAL C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_RESONANT_USUAL C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + - + AND EXISTS (SELECT 1 FROM TBL_ROCK_REPEATED_TRIAXIAL_U C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_ROCK_RESONANT_USUAL C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + - + AND EXISTS (SELECT 1 FROM TBL_DENSITY C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_DOWNHOLE C WHERE B.HOLE_CODE = C.HOLE_CODE ) - + AND EXISTS (SELECT 1 FROM tbl_refraction_survey C WHERE A.PROJECT_CODE = C.PROJECT_CODE ) - + AND EXISTS (SELECT 1 FROM TBL_RESISTIVITY_SURVEY C WHERE A.PROJECT_CODE = C.PROJECT_CODE ) - + AND B.HOLE_CODE IN( SELECT '1234567890' FROM DUAL @@ -235,144 +236,144 @@ UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_SPT - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_RQD - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_DSF - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_SLICKENSIDE_INFO - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_Q - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_RMR - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_FIELD_PRESSUREMETER - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_FIELD_PERMEABILITY - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_FIELD_WATERPRESSURE - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_POINTLOAD - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_JOINTSHEAR - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_UNIAXIAL - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_TRIAXIAL - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_CLASSIFICATION A, TBL_SAMPLE_INFO B WHERE A.SAMPLE_CODE = B.SAMPLE_CODE - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_CONSOLIDATION A, TBL_SAMPLE_INFO B WHERE A.SAMPLE_CODE = B.SAMPLE_CODE - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_CBR_COMPAC A, TBL_SAMPLE_INFO B WHERE A.SAMPLE_CODE = B.SAMPLE_CODE - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_UNCONFINED_USUAL A, TBL_SAMPLE_INFO B WHERE A.SAMPLE_CODE = B.SAMPLE_CODE - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_TRIAXIAL_USUAL A, TBL_SAMPLE_INFO B WHERE A.SAMPLE_CODE = B.SAMPLE_CODE - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_REPEATED_TRIAXIAL_USUAL - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_RESONANT_USUAL - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_REPEATED_TRIAXIAL_U - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_RESONANT_USUAL - + UNION ALL SELECT DISTINCT HOLE_CODE FROM TBL_DENSITY - + UNION ALL @@ -385,9 +386,11 @@ e.hole_code FROM tbl_refraction_survey d - LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N') + 'N') + ]]> - + UNION ALL @@ -395,12 +398,14 @@ e.hole_code FROM tbl_resistivity_survey d - LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N') + 'N') + ]]> ) - + GROUP BY A.PROJECT_CODE ) A @@ -421,9 +426,9 @@ , MAX(SUBSTR(PROJECT_START_SPOT,1,3)) SPOT FROM TBL_PROJECT_INFO A LEFT OUTER JOIN TBL_HEADER B - ON A.PROJECT_CODE = B.PROJECT_CODE AND B.USE_YN != 'N' + ON A.PROJECT_CODE = B.PROJECT_CODE AND NVL(B.USE_YN,' ') <> 'N' WHERE - A.USE_YN != 'N' AND NVL(A.USE_YN,' ') <> 'N' + NVL(A.USE_YN,' ') <> 'N' ]]> @@ -790,8 +795,10 @@ (SELECT DISTINCT e.hole_code FROM + 'N') + ]]> @@ -800,8 +807,10 @@ (SELECT DISTINCT e.hole_code FROM + 'N') + ]]> ) diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml index 38b2fca4..dcd3bae5 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/common.xml @@ -99,7 +99,7 @@ WHERE EMD_CD = INFO.PROJECT_END_SPOT_EMD) || ' ' || PROJECT_END_SPOT AS END_SPOT, PROJECT_INSTRUCTION_CODE FROM TEMP_PROJECT_INFO INFO - WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} + WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} ]]> @@ -113,10 +113,14 @@ TEMP_PROJECT_INFO A, TEMP_HEADER B - WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{holeCode} + 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{holeCode} + ]]> - WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE} + 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE} + ]]> @@ -190,7 +194,7 @@ WHERE ]]> 'N' AND PROJECT_CODE = #{mId} ]]> 'N' AND STATE = '6' ) T , TEMP_MANAGE_STATE OB WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+) diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml index e1ce1399..5df3b616 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/complete_SQL.xml @@ -68,7 +68,9 @@ , DECODE(STATE,'6','modifycall') AS MODIFYCALL FROM TEMP_PROJECT_INFO INFO - WHERE USE_YN != 'N' AND STATE = '6' + 'N' AND STATE = '6' + ]]> ) T , TEMP_MANAGE_STATE OB WHERE @@ -128,7 +130,9 @@ , DECODE(STATE,'6','insert') AS INS , DECODE(STATE,'6','modifycall') AS MODIFYCALL FROM TEMP_PROJECT_INFO INFO - WHERE USE_YN != 'N' AND STATE = '6' + 'N' AND STATE = '6' + ]]> ) T , TEMP_MANAGE_STATE OB WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+) diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml index 88cd99da..f0ea332b 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/header.xml @@ -5,7 +5,7 @@ @@ -23,7 +23,7 @@ FROM temp_header WHERE - USE_YN != 'N' AND project_code = #{PROJECT_CODE} + NVL(USE_YN,' ') <> 'N' AND project_code = #{PROJECT_CODE} and HOLE_LOCATION_X IS NOT NULL AND HOLE_LOCATION_Y IS NOT NULL ) ]]> @@ -50,7 +50,7 @@ (SELECT COORDINATE_E FROM TEMP_COORDINATE WHERE COORDINATE_CODE = B.HOLE_COORDINATE) AS HOLE_COORDINATE_E , (SELECT COORDINATE_P FROM TEMP_COORDINATE WHERE COORDINATE_CODE = B.HOLE_COORDINATE) AS HOLE_COORDINATE_P FROM TEMP_PROJECT_INFO A, TEMP_HEADER B - WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE (+) + WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE (+) AND A.PROJECT_CODE = #{PROJECT_CODE} AND B.HOLE_CODE = #{HOLE_CODE} ]]> @@ -62,9 +62,9 @@ (SELECT COORDINATE_E FROM TEMP_COORDINATE WHERE COORDINATE_CODE = B.HOLE_COORDINATE) AS HOLE_COORDINATE_E , (SELECT COORDINATE_P FROM TEMP_COORDINATE WHERE COORDINATE_CODE = B.HOLE_COORDINATE) AS HOLE_COORDINATE_P FROM TEMP_PROJECT_INFO A, TEMP_HEADER B - WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE (+) + WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE (+) AND A.PROJECT_CODE = #{PROJECT_CODE} - AND B.HOLE_CODE = ( select HOLE_CODE from temp_header where USE_YN != 'N' AND project_code= #{PROJECT_CODE} AND ROWNUM <= 1 ) + AND B.HOLE_CODE = ( select HOLE_CODE from temp_header where NVL(USE_YN,' ') <> 'N' AND project_code= #{PROJECT_CODE} AND ROWNUM <= 1 ) ]]> @@ -81,7 +81,7 @@ WHERE SA.HOLE_COORDINATE = SB.COORDINATE_CODE AND SA.HOLE_CODE = ( SELECT MIN(HOLE_CODE) ST_HOLE_CODE FROM TEMP_HEADER A - WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} + WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} AND HOLE_COORDINATE IS NOT NULL) ]]> @@ -103,7 +103,7 @@ WHERE SA.HOLE_COORDINATE = SB.COORDINATE_CODE 'N' AND PROJECT_CODE = #{PROJECT_CODE} ]]> @@ -111,14 +111,14 @@ WHERE SA.HOLE_COORDINATE = SB.COORDINATE_CODE #{HOLE_CODE} + WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE <> #{HOLE_CODE} ]]> 'N' AND PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE} ]]> @@ -274,7 +274,7 @@ DELETE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AN 'N' AND PROJECT_CODE = #{PROJECT_CODE} ]]> @@ -282,7 +282,7 @@ DELETE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AN 'N' AND PROJECT_CODE = #{PROJECT_CODE} ]]> @@ -294,7 +294,7 @@ DELETE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AN FROM temp_header WHERE - USE_YN != 'N' AND project_code = #{PROJECT_CODE} + NVL(USE_YN,' ') <> 'N' AND project_code = #{PROJECT_CODE} AND hole_code != #{HOLE_CODE} ]]> diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml index a94b5faf..ff1bfcea 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/holeCoord.xml @@ -19,7 +19,7 @@ , DECODE(STATE,'6','insert') AS INS , PROJECT_MASTER_COMPANY_O_CODE FROM TEMP_PROJECT_INFO INFO - WHERE USE_YN != 'N' AND STATE = '6' + WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6' AND REPORT_TYPE = 'CH' ) T WHERE 1=1 ]]> @@ -50,7 +50,7 @@ , HOLE_LOCATION_X , HOLE_LOCATION_Y FROM TEMP_HEADER - WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} + WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} ORDER BY HOLE_CODE ]]> @@ -59,7 +59,7 @@ SELECT PROJECT_NAME FROM TEMP_PROJECT_INFO - WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} + WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} ]]> 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 c0cce32c..5ebb10fa 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/info_SQL.xml @@ -87,6 +87,7 @@ - + 'N' + WHERE NVL(A.USE_YN,' ') <> 'N' AND A.STATE = '4' GROUP BY A.PROJECT_CODE, A.PROJECT_NAME, A.REPORT_TYPE,A.USERID, A.DATETIME + ]]> ) OA ) F WHERE 1=1 @@ -30,6 +31,7 @@ ORDER BY F.PROJECT_CODE DESC + diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml index e23334a2..799f760c 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml @@ -53,7 +53,7 @@ , PROJECT_MASTER_COMPANY_O_CODE FROM TEMP_PROJECT_INFO INFO WHERE - USE_YN != 'N' AND + NVL(USE_YN,' ') <> 'N' AND STATE in ('1','2','3','5') ) T , TEMP_MANAGE_STATE OB diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml index 44c750cc..2e19d893 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/manageList2019.xml @@ -12,9 +12,9 @@ SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TBL_META_INFO GROUP BY PROJECT_CODE ) , T2 AS ( - SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' GROUP BY PROJECT_CODE + SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' GROUP BY PROJECT_CODE UNION - SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TBL_PROJECT_INFO WHERE USE_YN != 'N' GROUP BY PROJECT_CODE + SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TBL_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' GROUP BY PROJECT_CODE ) , T3 AS ( SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TEMP_TOPO_GEOLOGY GROUP BY PROJECT_CODE diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml index c5f2d8e5..f3c70af2 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/map.xml @@ -8,15 +8,17 @@ 'N' AND A.PROJECT_CODE = B.PROJECT_CODE + WHERE NVL(A.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = #{PROJECT_CODE} ]]> diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml index f6f1ea37..2095362b 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/projectList.xml @@ -146,8 +146,8 @@ INSERT INTO TEMP_META_INFO ( diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml index 9c9f976d..28954acb 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml @@ -7,9 +7,9 @@ 'N' AND PROJECT_CODE = #{PROJECT_CODE} UNION ALL - SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_SB_NUMBER NUM, 'SB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} + SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_SB_NUMBER NUM, 'SB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} UNION ALL - SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_BB_NUMBER NUM, 'BB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} + SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_BB_NUMBER NUM, 'BB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} UNION ALL - SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_TB_NUMBER NUM, 'TB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} + SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_TB_NUMBER NUM, 'TB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} UNION ALL - SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_BH_NUMBER NUM, 'BH' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} + SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_BH_NUMBER NUM, 'BH' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} UNION ALL - SELECT STATE, PROJECT_CODE, PROJECT_NAME, PROJECT_TESTPITT_NUMBER NUM, 'TP' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} + SELECT STATE, PROJECT_CODE, PROJECT_NAME, PROJECT_TESTPITT_NUMBER NUM, 'TP' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} UNION ALL - SELECT STATE, PROJECT_CODE, PROJECT_NAME, PROJECT_ORGERBORING_NUMBER NUM, 'HA' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} + SELECT STATE, PROJECT_CODE, PROJECT_NAME, PROJECT_ORGERBORING_NUMBER NUM, 'HA' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} ]]> @@ -169,7 +169,7 @@ @@ -177,7 +177,7 @@ 'N' AND PROJECT_CODE =#{PROJECT_CODE} AND CLASS_CODE IS NOT NULL) PROJECT_INFO, (SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_TOPO_GEOLOGY WHERE PROJECT_CODE =#{PROJECT_CODE}) TOPO_GEOLOGY, (SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_RESISTIVITY_SURVEY WHERE PROJECT_CODE =#{PROJECT_CODE}) RESISTIVITY_SURVEY, (SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_REFRACTION_SURVEY WHERE PROJECT_CODE =#{PROJECT_CODE}) REFRACTION_SURVEY, @@ -190,7 +190,7 @@ 'N' AND PROJECT_CODE = #{PROJECT_CODE} UNION ALL SELECT HOLE_CODE, 'SELECTCLASS_INFO' AS title FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE = #{PROJECT_CODE} UNION ALL @@ -474,6 +474,7 @@ @@ -656,7 +658,7 @@ INSERT INTO TEMP_SMS_LOG ( WHERE ]]> 'N' AND PROJECT_CODE = #{mId} ]]> 'N' AND PROJECT_CODE = #{PROJECT_CODE} ]]> diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml index 0051f372..95f29fef 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/rock.xml @@ -129,7 +129,7 @@ B.HOLE_CODE, B.HOLE_NAME FROM TEMP_PROJECT_INFO A, TEMP_HEADER B - WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE + WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE} ]]> diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml index 1bc681c1..152683cd 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/sand_SQL.xml @@ -7,12 +7,14 @@