feat: 프로젝트정보 및 시추공 사용 여부에 따른 노출 수정

main
thkim 2024-12-27 17:54:44 +09:00
parent 0737aa6428
commit dbed79b889
37 changed files with 439 additions and 285 deletions

View File

@ -1,6 +0,0 @@
projectKey=geoinfo
serverUrl=http://localhost:9000
serverVersion=9.6.1.59531
dashboardUrl=http://localhost:9000/dashboard?id=geoinfo
ceTaskId=AYPkQT_oFODTiojy3qza
ceTaskUrl=http://localhost:9000/api/ce/task?id=AYPkQT_oFODTiojy3qza

View File

@ -0,0 +1,3 @@
Manifest-Version: 1.0
Class-Path:

View File

@ -1,3 +1,65 @@
#src\main\resources\egovframework\egovProps\globals.properties
src\main\webapp\WEB-INF\views\home\personalinfo.jsp
src\main\webapp\WEB-INF\views\body\join\provision.jsp
#TEMP_HEADER
src\main\java\geoinfo\com\WebConfirm.java
src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapControl_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapLeft_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\common.xml
src\main\resources\egovframework\sqlmap\mapper\regi\header.xml
src\main\resources\egovframework\sqlmap\mapper\regi\holeCoord.xml
src\main\resources\egovframework\sqlmap\mapper\regi\layerInfo_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml
src\main\resources\egovframework\sqlmap\mapper\regi\map.xml
src\main\resources\egovframework\sqlmap\mapper\regi\projectList.xml
src\main\resources\egovframework\sqlmap\mapper\regi\regi.xml
src\main\resources\egovframework\sqlmap\mapper\regi\rock.xml
src\main\resources\egovframework\sqlmap\mapper\regi\sand_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\selectClass2019_SQL.xml
#TEMP_PROJECT_INFO
src\main\java\geoinfo\com\WebConfirm.java
src\main\java\geoinfo\regi\surface\SurfaceController.java
src\main\resources\egovframework\sqlmap\mapper\main\Home_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapLeft_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\common.xml
src\main\resources\egovframework\sqlmap\mapper\regi\complete_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\complete.xml
src\main\resources\egovframework\sqlmap\mapper\regi\header.xml
src\main\resources\egovframework\sqlmap\mapper\regi\holeCoord.xml
src\main\resources\egovframework\sqlmap\mapper\regi\info_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml
src\main\resources\egovframework\sqlmap\mapper\regi\manageList.xml
src\main\resources\egovframework\sqlmap\mapper\regi\manageList2019.xml
src\main\resources\egovframework\sqlmap\mapper\regi\map.xml
src\main\resources\egovframework\sqlmap\mapper\regi\projectList.xml
src\main\resources\egovframework\sqlmap\mapper\regi\regi.xml
src\main\resources\egovframework\sqlmap\mapper\regi\rock.xml
src\main\resources\egovframework\sqlmap\mapper\regi\sand_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\selectClass_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\selectClass2019_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\surface_SQL.xml
src\main\webapp\WEB-INF\views\web\input\surface\refraction_survey_json_data.jsp
src\main\webapp\WEB-INF\views\web\input\surface\refraction_survey_sub_json_data.jsp
src\main\webapp\WEB-INF\views\web\input\surface\resistivity_survey_jsondata.jsp
src\main\webapp\WEB-INF\views\web\input\surface\resistivity_survey_sub_jsondata.jsp
#TBL_HEADER
src\main\java\geoinfo\com\WebConfirm.java
src\main\resources\egovframework\sqlmap\mapper\com\Jusangdo_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\main\Home_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapControl_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapCoordSearch_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapInformation_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapLeft_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapProjectSearch_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\regi.xml
#TBL_PROJECT_INFO
src\main\java\geoinfo\com\WebConfirm.java
src\main\resources\egovframework\sqlmap\mapper\main\Home_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapControl_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapCoordSearch_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapInformation_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapLeft_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapMain_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\map\MapProjectSearch_SQL.xml
src\main\resources\egovframework\sqlmap\mapper\regi\manageList2019.xml

View File

@ -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 PROJECT_CODE = [PROJECT_CODE] ";
sql += " FROM TEMP_PROJECT_INFO WHERE 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 PROJECT_CODE = [PROJECT_CODE]";
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]";
(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 PROJECT_CODE = [PROJECT_CODE]";
sql += " \n FROM TEMP_HEADER WHERE 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.PROJECT_CODE = B.PROJECT_CODE ");
sbQuery.append(" WHERE A.USE_YN != 'N' AND 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 PROJECT_CODE = [PROJECT_CODE]";
sql = "SELECT * FROM TEMP_PROJECT_INFO WHERE 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 PROJECT_CODE = [PROJECT_CODE]";
sql += " \n FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
(query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", project_code);
resultSet = query.execute(connection);
if (resultSet.next()) {

View File

@ -162,7 +162,7 @@ public class SurfaceController {
//
// **************************************프로젝트정보의
// 측선수**************************************//
strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = [PROJECT_CODE]";
strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
Map<String, Object> result = surfaceService.selectTempProjectInfo(params);
@ -921,7 +921,7 @@ public class SurfaceController {
//
// **************************************프로젝트정보의
// 측선수**************************************//
strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = [PROJECT_CODE]";
strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
Map<String, Object> result = surfaceService.selectTempProjectInfo(params);
if (result != null) {

View File

@ -6,6 +6,6 @@
SELECT
PROJECT_CODE
FROM TBL_HEADER
WHERE HOLE_CODE = #{holeCode}
WHERE USE_YN != 'N' AND HOLE_CODE = #{holeCode}
</select>
</mapper>

View File

@ -31,6 +31,7 @@
SELECT COUNT(PROJECT_CODE) CNT
FROM TEMP_PROJECT_INFO
WHERE
USE_YN != 'N' AND
<if test="userId != null">
USERID = #{userId} AND
</if>
@ -127,7 +128,7 @@
<select id="selectInformationInfo" parameterType="String" resultType="int">
<![CDATA[
SELECT COUNT(HOLE_CODE) CNT FROM TBL_HEADER
WHERE PROJECT_CODE IN
WHERE USE_YN != 'N' AND PROJECT_CODE IN
(
SELECT PROJECT_CODE FROM POP_PROJECT_INFO
WHERE PROJECT_MASTER_COMPANY_CODE IN
@ -141,7 +142,7 @@
<!-- 지반정보 보유현황 view (미지정) -->
<select id="selectInformationInfoNon" parameterType="String" resultType="int">
SELECT COUNT(HOLE_CODE) CNT FROM TBL_HEADER
WHERE PROJECT_CODE IN
WHERE USE_YN != 'N' AND PROJECT_CODE IN
(
SELECT PROJECT_CODE FROM POP_PROJECT_INFO
WHERE PROJECT_MASTER_COMPANY_CODE NOT IN
@ -199,7 +200,7 @@
<![CDATA[
SELECT SUBSTR(PROJECT_START_DATE, 1, 4) YEAR
FROM TBL_PROJECT_INFO
WHERE PROJECT_START_DATE IS NOT NULL
WHERE USE_YN != 'N' AND PROJECT_START_DATE IS NOT NULL
GROUP BY SUBSTR(PROJECT_START_DATE, 1, 4)
ORDER BY YEAR
]]>
@ -207,7 +208,7 @@
<select id="selectYearEnd" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
SELECT SUBSTR(PROJECT_START_DATE, 1, 4) YY
FROM TBL_PROJECT_INFO
WHERE PROJECT_START_DATE IS NOT NULL
WHERE USE_YN != 'N' AND PROJECT_START_DATE IS NOT NULL
<if test="_parameter != ''">
AND SUBSTR(PROJECT_START_DATE, 1, 4) >= #{_parameter }
</if>
@ -224,7 +225,7 @@
SELECT
AA.PROJECT_CODE, SUBSTR(BB.PROJECT_START_SPOT,0,3) HOLE_SPOT_SD, SUBSTR(BB.PROJECT_START_DATE, 0, 4) PROJECT_YEAR, BB.PROJECT_MASTER_COMPANY_CODE
FROM TBL_HEADER AA, TBL_PROJECT_INFO BB
WHERE AA.PROJECT_CODE = BB.PROJECT_CODE
WHERE BB.USE_YN != 'N' AND AA.USE_YN != 'N' AND AA.PROJECT_CODE = BB.PROJECT_CODE
<if test = "startDate != '0000' and startDate != null">
<![CDATA[ AND SUBSTR(BB.PROJECT_START_DATE,0,4) BETWEEN #{startDate} AND #{endDate}]]>
</if>
@ -240,7 +241,7 @@
<!-- 해당 프로젝트 코드의 시추공 가져오기 -->
<select id="selectHeaderByProjectCode" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
<![CDATA[ SELECT HOLE_CODE FROM TBL_HEADER WHERE PROJECT_CODE = #{pcode} ]]>
<![CDATA[ SELECT HOLE_CODE FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = #{pcode} ]]>
</select>
<select id="userSelect" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">

View File

@ -235,7 +235,7 @@
A.CANCEL_ETC, A.USE_CONTENTS, A.FILENAME, A.DOWNYN, A.DOWN_APP, A.SICHUINFO, A.SICHUCOUNT,
(
SELECT PROJECT_NAME FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) = TRIM(A.METADATAID)
WHERE USE_YN != 'N' AND TRIM(PROJECT_CODE) = TRIM(A.METADATAID)
) AS NAMES,
(
SELECT NAME FROM WEB_DOWNLOAD_PURPOSE
@ -260,7 +260,7 @@
<select id="selectMyPageView" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
<![CDATA[
SELECT A.IDX, A.USERID, A.METADATAID, A.DATETIME, TRIM(A.METADATAID) AS PROJECTCODE,
(SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE TRIM(PROJECT_CODE) = TRIM(A.METADATAID)) AS PROJECTNAME,
(SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE USE_YN != '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,
@ -285,7 +285,7 @@
<select id="selectProjectNameByPCode" resultType="String">
<![CDATA[
SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE TRIM(PROJECT_CODE) = #{pcode}
SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{pcode}
]]>
</select>
@ -513,8 +513,8 @@
<![CDATA[
SELECT ROWNUM, B.PROJECT_CODE, B.PROJECT_NAME
FROM TEMP_HEADER A LEFT OUTER JOIN TEMP_PROJECT_INFO B
ON A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.LOCATION_EXCEPTION = 'Y'
ON A.PROJECT_CODE = B.PROJECT_CODE AND B.USE_YN != 'N'
WHERE A.USE_YN != 'N' AND A.LOCATION_EXCEPTION = 'Y'
GROUP BY ROWNUM, B.PROJECT_CODE, B.PROJECT_NAME
ORDER BY PROJECT_CODE
]]>

View File

@ -7,13 +7,16 @@
SELECT CEIL(MAX(ROWNUM)/ #{viewPage}) AS LASTPAGE
FROM
(
SELECT PROJECT_NAME, PROJECT_HOLE_NUMBER, PROJECT_CODE
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN
SELECT
PROJECT_NAME, PROJECT_HOLE_NUMBER, PROJECT_CODE
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND TRIM(PROJECT_CODE) IN
(
SELECT TRIM(PROJECT_CODE)
FROM TBL_HEADER A
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
WHERE 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}
]]>
<if test="polygonType =='circle'">
@ -49,11 +52,14 @@
(
SELECT
PROJECT_NAME, PROJECT_CODE, PROJECT_HOLE_NUMBER
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN(
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND
TRIM(PROJECT_CODE) IN(
SELECT TRIM(PROJECT_CODE)
FROM TBL_HEADER A
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
WHERE 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}
]]>
<if test="polygonType =='circle'">
@ -81,15 +87,20 @@
SELECT CEIL(MAX(ROWNUM)/ #{viewPage}) AS LASTPAGE
FROM
(
SELECT PROJECT_NAME, PROJECT_HOLE_NUMBER, PROJECT_CODE
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN
(
SELECT TRIM(PROJECT_CODE)
FROM
tbl_header
where ('0',hole_code) IN ( ${sichuHolecode} )
)
SELECT
PROJECT_NAME, PROJECT_HOLE_NUMBER, PROJECT_CODE
FROM
TBL_PROJECT_INFO
WHERE
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} )
)
) A,
(
SELECT METADATAID, FILEPATH, MAX(START_DATE) AS START_DATE, MAX(SUBSTR(START_SPOT,1,3)) SPOT
@ -116,12 +127,18 @@
(
SELECT
PROJECT_NAME, PROJECT_CODE, PROJECT_HOLE_NUMBER
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN(
SELECT TRIM(PROJECT_CODE)
FROM tbl_header
where ('0',hole_code) IN ( ${sichuHolecode} )
)
FROM
TBL_PROJECT_INFO
WHERE
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} )
)
) A,
(
SELECT
@ -186,7 +203,7 @@
A.HOLE_TOTAL_DEPTH DEPTH,A.HOLE_EL
EL,A.HOLE_WL WL, A.HOLE_DATE_FROM SDATE, A.HOLE_DATE_TO EDATE
FROM TBL_HEADER A, TBL_PROJECT_INFO B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE IN
<if test="areaHcodeArray != null and areaHcodeArray != ''">
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
@ -243,7 +260,8 @@
) AS SPOT,
A.HOLE_TOTAL_DEPTH DEPTH,A.HOLE_EL EL,A.HOLE_WL WL, A.HOLE_DATE_FROM SDATE, A.HOLE_DATE_TO EDATE, B.PROJECT_OFFERING_MATERIALS
FROM TBL_HEADER A, TBL_PROJECT_INFO B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
WHERE
A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE IN
<if test="areaHcodeArray != null and areaHcodeArray != ''">
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
@ -273,11 +291,13 @@
) AS SPOT,
A.HOLE_TOTAL_DEPTH DEPTH,A.HOLE_EL
EL,A.HOLE_WL WL, A.HOLE_DATE_FROM SDATE, A.HOLE_DATE_TO EDATE
FROM TBL_HEADER A, TBL_PROJECT_INFO B, WEB_CART C
WHERE A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE = C.HOLE_CODE
AND TRIM(C.USERID) = #{userId}
AND C.CART_TYPE = 'CTP002'
FROM
TBL_HEADER A, TBL_PROJECT_INFO B, WEB_CART C
WHERE
A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE = C.HOLE_CODE
AND TRIM(C.USERID) = #{userId}
AND C.CART_TYPE = 'CTP002'
)
</select>
@ -301,7 +321,7 @@
) AS SPOT,
A.HOLE_TOTAL_DEPTH DEPTH,A.HOLE_EL EL,A.HOLE_WL WL, A.HOLE_DATE_FROM SDATE, A.HOLE_DATE_TO EDATE, B.PROJECT_OFFERING_MATERIALS
FROM TBL_HEADER A, TBL_PROJECT_INFO B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
<if test="sCode != 'No'">
AND A.HOLE_CODE IN
<foreach collection="sCode" item="sCode" index="index" open="(" close=")" separator=",">
@ -420,15 +440,19 @@
SELECT CEIL(MAX(ROWNUM) / #{viewPage}) AS LASTPAGE
FROM
(
SELECT PROJECT_NAME, PROJECT_HOLE_NUMBER, PROJECT_CODE
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN
(
SELECT TRIM(PROJECT_CODE)
FROM TBL_HEADER A
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY}
)
SELECT
PROJECT_NAME, PROJECT_HOLE_NUMBER, PROJECT_CODE
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND
TRIM(PROJECT_CODE) IN
(
SELECT TRIM(PROJECT_CODE)
FROM TBL_HEADER A
WHERE 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}
)
) A,
(
SELECT METADATAID, FILEPATH, MAX(START_DATE) AS START_DATE, MAX(SUBSTR(START_SPOT,1,3)) SPOT
@ -453,14 +477,17 @@
(
SELECT
PROJECT_NAME, PROJECT_CODE, PROJECT_HOLE_NUMBER
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN
(
SELECT TRIM(PROJECT_CODE)
FROM TBL_HEADER A
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY}
)
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND
TRIM(PROJECT_CODE) IN
(
SELECT TRIM(PROJECT_CODE)
FROM TBL_HEADER A
WHERE 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}
)
) A,
(
SELECT
@ -539,7 +566,7 @@
SELECT count(hole_code) as count
FROM TBL_HEADER A
<![CDATA[
WHERE HOLE_LOCATION_TM_X >= #{minx} AND HOLE_LOCATION_TM_X <= #{maxx}
WHERE 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}
]]>
<if test="polygonType =='circle'">
@ -559,13 +586,13 @@
PROJ.PROJECT_HOLE_NUMBER
FROM
TBL_HEADER_HOLE HOLE
LEFT OUTER JOIN TBL_PROJECT_INFO PROJ ON TRIM(HOLE.PROJECT_CODE) = TRIM(PROJ.PROJECT_CODE)
LEFT OUTER JOIN TBL_PROJECT_INFO PROJ ON TRIM(HOLE.PROJECT_CODE) = TRIM(PROJ.PROJECT_CODE) AND PROJ.USE_YN != 'N'
WHERE
SDO_ANYINTERACT(HOLE.THE_GEOM, SDO_UTIL.FROM_WKTGEOMETRY(#{value})) = 'TRUE' AND ROWNUM = 1
</select>
<select id="selectFilePath" parameterType="map" resultType="egovMap">
SELECT DISTINCT A.FILEPATH, B.PROJECT_NAME FROM MTDT_SEARCH A, TBL_PROJECT_INFO B WHERE TRIM(B.PROJECT_CODE) = TRIM(A.METADATAID(+)) AND B.PROJECT_CODE = #{metadataId}
SELECT DISTINCT A.FILEPATH, B.PROJECT_NAME FROM MTDT_SEARCH A, TBL_PROJECT_INFO B WHERE B.USE_YN != 'N' AND TRIM(B.PROJECT_CODE) = TRIM(A.METADATAID(+)) AND B.PROJECT_CODE = #{metadataId}
</select>
<select id="selectLoItems" parameterType="map" resultType="egovMap">
@ -592,7 +619,7 @@
FROM
TBL_RESISTIVITY_SURVEY_SUB A , TBL_PROJECT_INFO B
WHERE
A.PROJECT_CODE = B.PROJECT_CODE
B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
]]>
<choose>
<when test="searchTitle == 0">
@ -611,9 +638,12 @@
<select id="selectLoItemsCount" resultType="int">
<![CDATA[
SELECT count(*) as count
FROM TBL_RESISTIVITY_SURVEY_SUB A , TBL_PROJECT_INFO B
WHERE A.project_code = B.project_code
SELECT
count(*) as count
FROM
TBL_RESISTIVITY_SURVEY_SUB A , TBL_PROJECT_INFO B
WHERE
B.USE_YN != 'N' AND A.project_code = B.project_code
]]>
</select>
@ -640,7 +670,7 @@
</select>
<select id="selectHodeCode" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT HOLE_CODE FROM TBL_HEADER WHERE PROJECT_CODE IN
SELECT HOLE_CODE FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE IN
]]>
<foreach collection="sichHole" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
@ -736,6 +766,7 @@
FROM
temp_header
WHERE
USE_YN != 'N' AND
project_code = #{projectCode}
]]>
</select>

View File

@ -6,10 +6,13 @@
SELECT CEIL(MAX(ROWNUM)/ #{viewPage} ) AS LASTPAGE
FROM
(
SELECT ROW_NUMBER() OVER (ORDER BY MAX(A.PROJECT_START_DATE) DESC) RNK
,B.HOLE_CODE AS HOLE_CODE, A.PROJECT_NAME AS PROJECT_NAME, A.PROJECT_CODE AS PROJECT_CODE, B.HOLE_NAME AS HOLE_NAME, COUNT(B.HOLE_CODE) HOLE_CNT,MAX(A.PROJECT_START_DATE) START_DATE
FROM TBL_PROJECT_INFO A, TBL_HEADER B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
SELECT
ROW_NUMBER() OVER (ORDER BY MAX(A.PROJECT_START_DATE) DESC) RNK
,B.HOLE_CODE AS HOLE_CODE, A.PROJECT_NAME AS PROJECT_NAME, A.PROJECT_CODE AS PROJECT_CODE, B.HOLE_NAME AS HOLE_NAME, COUNT(B.HOLE_CODE) HOLE_CNT,MAX(A.PROJECT_START_DATE) START_DATE
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
<if test="tmX != ''">
<![CDATA[
@ -33,10 +36,14 @@
SELECT RNK, HOLE_CODE, PROJECT_NAME, PROJECT_CODE, HOLE_NAME, HOLE_CNT, START_DATE
FROM
(
SELECT ROW_NUMBER() OVER (ORDER BY MAX(A.PROJECT_START_DATE) DESC) RNK
,B.HOLE_CODE AS HOLE_CODE, A.PROJECT_NAME AS PROJECT_NAME, A.PROJECT_CODE AS PROJECT_CODE, B.HOLE_NAME AS HOLE_NAME, COUNT(B.HOLE_CODE) HOLE_CNT,MAX(A.PROJECT_START_DATE) START_DATE
FROM TBL_PROJECT_INFO A, TBL_HEADER B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
SELECT
ROW_NUMBER() OVER (ORDER BY MAX(A.PROJECT_START_DATE) DESC) RNK
,B.HOLE_CODE AS HOLE_CODE, A.PROJECT_NAME AS PROJECT_NAME, A.PROJECT_CODE AS PROJECT_CODE, B.HOLE_NAME AS HOLE_NAME, COUNT(B.HOLE_CODE) HOLE_CNT,MAX(A.PROJECT_START_DATE) START_DATE
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
<if test="tmX != ''">
<![CDATA[

View File

@ -10,14 +10,14 @@
]]>
<choose>
<when test="areaHcodeArray != null and areaHcodeArray != '' and areaHcodeArray != 'undefiend'">
where HOLE_CODE IN
where USE_YN != 'N' AND HOLE_CODE IN
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
</foreach>
</when>
<otherwise>
<![CDATA[
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
WHERE 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}
]]>
</otherwise>
@ -32,14 +32,14 @@
]]>
<choose>
<when test="areaHcodeArray != null and areaHcodeArray != ''and areaHcodeArray != 'undefiend'">
where HOLE_CODE IN
where USE_YN != 'N' AND HOLE_CODE IN
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
</foreach>
</when>
<otherwise>
<![CDATA[
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
WHERE 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}
]]>
</otherwise>
@ -49,14 +49,15 @@
<select id="selectItems" parameterType="map" resultType="egovMap">
SELECT
HOLE_CODE,B.PROJECT_NAME,
(SELECT USCS_NAME FROM TBL_SCIENCE_LAYER_TB WHERE A.LAYER_CLASS_CODE = USCS_CODE) LAYER,
A.HOLE_TOTAL_DEPTH DEPTH,A.HOLE_EL EL,A.HOLE_WL WL, A.HOLE_DATE_FROM SDATE, A.HOLE_DATE_TO EDATE
HOLE_CODE,B.PROJECT_NAME,
(SELECT USCS_NAME FROM TBL_SCIENCE_LAYER_TB WHERE A.LAYER_CLASS_CODE = USCS_CODE) LAYER,
A.HOLE_TOTAL_DEPTH DEPTH,A.HOLE_EL EL,A.HOLE_WL WL, A.HOLE_DATE_FROM SDATE, A.HOLE_DATE_TO EDATE
FROM
TBL_HEADER A, TBL_PROJECT_INFO B
TBL_HEADER A, TBL_PROJECT_INFO B
WHERE
A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE IN
B.USE_YN != 'N' AND
A.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE IN
<foreach collection="holeCode" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
</foreach>
@ -90,12 +91,16 @@
, 'no' as CAD
, 'no' as SHAPE
FROM (
SELECT A.PROJECT_CODE
, replace(replace(A.PROJECT_NAME ,chr(10),' '),chr(13),' ') PROJECT_NAME
, COUNT(B.HOLE_CODE) HOLE_CNT
FROM TBL_PROJECT_INFO A
, TBL_HEADER B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
SELECT
A.PROJECT_CODE
, replace(replace(A.PROJECT_NAME ,chr(10),' '),chr(13),' ') PROJECT_NAME
, COUNT(B.HOLE_CODE) HOLE_CNT
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
<choose>
<when test="sido != '' and sido != null">
<![CDATA[
@ -108,7 +113,8 @@
]]>
</when>
</choose>
GROUP BY A.PROJECT_CODE, A.PROJECT_NAME
GROUP
BY A.PROJECT_CODE, A.PROJECT_NAME
) SA
WHERE EXISTS (SELECT 1
FROM S3D_CROWD_ANAL S2A
@ -197,8 +203,12 @@
AND SUBSTR(A.HOLE_ADMINISTRATIVE_DISTRICT,4,3)=D.MD_ID
)
) VLU
FROM GEOINFO.TBL_HEADER A, GEOINFO.TBL_PROJECT_INFO B
WHERE TRIM(A.HOLE_CODE) = (#{holeCode})
FROM
GEOINFO.TBL_HEADER A, GEOINFO.TBL_PROJECT_INFO B
WHERE
A.USE_YN != 'N' AND
B.USE_YN != 'N' AND
TRIM(A.HOLE_CODE) = (#{holeCode})
AND A.PROJECT_CODE = B.PROJECT_CODE
</select>
@ -271,9 +281,11 @@
A.HOLE_WL WL,
A.HOLE_DATE_FROM SDATE,
A.HOLE_DATE_TO EDATE
FROM TBL_HEADER A,
TBL_PROJECT_INFO B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
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
AND A.HOLE_CODE IN
]]>
@ -288,7 +300,7 @@
(
SELECT TRIM(HOLE_CODE)
FROM TBL_HEADER A
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
WHERE 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}
)
]]>
@ -318,8 +330,9 @@ FROM (SELECT ROWNUM RNK,
A.HOLE_DATE_TO EDATE
FROM TBL_HEADER A,
TBL_PROJECT_INFO B
WHERE A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE IN
WHERE
A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND A.HOLE_CODE IN
]]>
<choose>
<when test="areaHcodeArray != null and areaHcodeArray != ''">
@ -331,9 +344,11 @@ FROM (SELECT ROWNUM RNK,
<![CDATA[
(
SELECT TRIM(HOLE_CODE)
FROM TBL_HEADER A
WHERE HOLE_LOCATION_TM_X >= #{minX} AND HOLE_LOCATION_TM_X <= #{maxX}
AND HOLE_LOCATION_TM_Y >= #{minY} AND HOLE_LOCATION_TM_Y <= #{maxY}
FROM
TBL_HEADER A
WHERE
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}
)
]]>
</otherwise>
@ -360,8 +375,11 @@ FROM (SELECT ROWNUM RNK,
<select id="selectProjectList" parameterType="map" resultType="egovMap">
SELECT
*
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND
TRIM(PROJECT_CODE) IN
<foreach collection="projectList" item="project" index="index" open="(" close=")" separator=",">
#{project}
</foreach>

View File

@ -19,8 +19,9 @@
</if>
<![CDATA[
WHERE A.PROJECT_CODE = B.PROJECT_CODE
AND NVL(A.USE_YN,' ') <> 'N'
WHERE
A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND NVL(A.USE_YN,' ') <> 'N'
]]>
<if test="gugun != 'all'">
@ -56,7 +57,8 @@
</if>
<![CDATA[
WHERE A.PROJECT_CODE = B.PROJECT_CODE
WHERE
A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND NVL(A.USE_YN,' ') <> 'N'
]]>
@ -103,8 +105,9 @@
and TRIM(a.PROJECT_CODE) IN(
SELECT TRIM(PROJECT_CODE)
FROM
tbl_header
where ('0',hole_code) IN ( ${sichuHolecode} )
tbl_header
where
USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} )
)
]]>
</if>
@ -113,8 +116,9 @@
and TRIM(a.PROJECT_CODE) IN(
SELECT TRIM(PROJECT_CODE)
FROM
tbl_header
where ('0',hole_code) IN ( ${sichuHolecode} )
tbl_header
where
USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} )
)
]]>
</if>
@ -154,7 +158,7 @@
</if>
<![CDATA[
WHERE A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND NVL(A.USE_YN,' ') <> 'N'
]]>
@ -208,7 +212,7 @@
</if>
<![CDATA[
WHERE A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND NVL(A.USE_YN,' ') <> 'N'
]]>
@ -256,8 +260,9 @@
and TRIM(a.PROJECT_CODE) IN(
SELECT TRIM(PROJECT_CODE)
FROM
tbl_header
where ('0',hole_code) IN ( ${sichuHolecode} )
tbl_header
where
USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} )
)
]]>
</if>
@ -266,8 +271,9 @@
and TRIM(a.PROJECT_CODE) IN(
SELECT TRIM(PROJECT_CODE)
FROM
tbl_header
where ('0',hole_code) IN ( ${sichuHolecode} )
tbl_header
where
USE_YN != 'N' AND ('0',hole_code) IN ( ${sichuHolecode} )
)
]]>
</if>
@ -298,8 +304,10 @@
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
FROM TBL_PROJECT_INFO A
WHERE TRIM(PROJECT_CODE) = #{pcode}
FROM
TBL_PROJECT_INFO A
WHERE
A.USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{pcode}
]]>
</select>
@ -314,12 +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 PROJECT_CODE=#{pcode}) AS MINX,
(SELECT MAX(HOLE_LOCATION_TM_X) MAXX FROM TBL_HEADER WHERE PROJECT_CODE=#{pcode}) AS MAXX,
(SELECT MIN(HOLE_LOCATION_TM_Y) MINY FROM TBL_HEADER WHERE PROJECT_CODE=#{pcode}) AS MINY,
(SELECT MAX(HOLE_LOCATION_TM_Y) MAXY FROM TBL_HEADER WHERE PROJECT_CODE=#{pcode}) AS MAXY
FROM TBL_PROJECT_INFO A
WHERE TRIM(PROJECT_CODE) = #{pcode}
(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
FROM
TBL_PROJECT_INFO A
WHERE
A.USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{pcode}
]]>
</select>
@ -328,8 +338,10 @@
SELECT B.*,
(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 tbl_PROJECT_INFO A, tbl_HEADER B
WHERE A.PROJECT_CODE = B.PROJECT_CODE (+)
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 (+)
AND A.PROJECT_CODE = #{pcode}
AND B.HOLE_CODE = #{hcode}
]]>
@ -343,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 PROJECT_CODE = PJT.PROJECT_CODE)
THEN (SELECT PROJECT_MASTER_COMPANY_NAME FROM TEMP_PROJECT_INFO WHERE 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,
@ -385,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.hole_code='{PARAMETER.H_CODE}')
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}')
as hole_wl,
HOL.HOLE_BORING_MACHINE,
FUNC_COMM_NAME('CM009', HOL.HOLE_BORING_METHOD) HOLE_BORING_METHOD,
@ -422,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
ON HOL.PROJECT_CODE = PJT.PROJECT_CODE AND PJT.USE_YN != 'N'
LEFT OUTER JOIN TEMP_COORDINATE CRD
ON HOL.HOLE_COORDINATE = CRD.COORDINATE_CODE
WHERE
HOL.HOLE_CODE= #{hcode}
HOL.USE_YN != 'N' AND HOL.HOLE_CODE= #{hcode}
]]>
</select>
@ -457,7 +469,7 @@
FROM
TEMP_RESISTIVITY_SURVEY_SUB A , TBL_PROJECT_INFO B
WHERE
A.PROJECT_CODE = B.PROJECT_CODE
B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND
TRIM(B.PROJECT_CODE) = #{pcode}
ORDER BY LINE_NUMBER , SEQ
@ -474,9 +486,12 @@
B.HOLE_WL WL,
B.HOLE_LOCATION_TM_X XX,
B.HOLE_LOCATION_TM_Y YY
FROM TBL_PROJECT_INFO A,TBL_HEADER B
WHERE TRIM(A.PROJECT_CODE) = TRIM(B.PROJECT_CODE) AND TRIM(B.PROJECT_CODE) = #{pcode}
ORDER BY HOLE_CODE
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}
ORDER
BY HOLE_CODE
]]>
</select>
@ -487,7 +502,7 @@
FROM
tbl_project_info a
WHERE
a.project_name LIKE '%'|| #{pName}|| '%'
a.USE_YN != 'N' AND a.project_name LIKE '%'|| #{pName}|| '%'
AND ROWNUM <= 10
]]>
</select>
@ -498,6 +513,8 @@
project_name
FROM
tbl_project_info
WHERE
USE_YN != 'N'
]]>
</select>
@ -634,16 +651,20 @@
<![CDATA[
SELECT
*
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) = #{projectCode}
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{projectCode}
]]>
</select>
<select id="selectProjectList" parameterType="map" resultType="egovMap">
SELECT
*
FROM TBL_PROJECT_INFO
WHERE TRIM(PROJECT_CODE) IN
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND TRIM(PROJECT_CODE) IN
<foreach collection="projectList" item="project" index="index" open="(" close=")" separator=",">
#{project}
</foreach>
@ -709,6 +730,7 @@
MAX(HOLE_LOCATION_TM_Y) MAXY
FROM TBL_HEADER
WHERE
USE_YN != 'N' AND
]]>
<if test="projectCode != null">
<![CDATA[
@ -887,7 +909,7 @@
<select id="selectSichInformationCount" parameterType="map" resultType="egovMap">
<![CDATA[
select a.*,
(SELECT SUM(QUALITY_INFORMATION) FROM TBL_PROJECT_INFO WHERE PROJECT_CODE = #{pcode}) as QUALITY_INFORMATION,
(SELECT SUM(QUALITY_INFORMATION) FROM TBL_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = #{pcode}) as QUALITY_INFORMATION,
(SELECT count(distinct hole_code) FROM TEMP_SAMPLE_INFO WHERE PROJECT_CODE = #{pcode}) AS SAMPLE_INFO
from (
select
@ -1016,8 +1038,10 @@
B.HOLE_LOCATION_TM_X XX,
B.HOLE_LOCATION_TM_Y YY,
b.HOLE_NAME
from TBL_HEADER B left join tbl_project_info a on TRIM(A.PROJECT_CODE) = TRIM(B.PROJECT_CODE)
where a.project_code=#{pcode}) b
from
TBL_HEADER B left join tbl_project_info a on TRIM(A.PROJECT_CODE) = TRIM(B.PROJECT_CODE) AND a.USE_YN != 'N'
where
B.USE_YN != 'N' AND a.project_code=#{pcode}) b
</select>
@ -1359,7 +1383,7 @@
left join (select distinct(hole_code) from TBL_DENSITY where hole_code like #{pcodePer}) C3 on C3.hole_code = b.hole_code
</if>
where b.project_code = #{pcode} order by b.hole_code
where B.USE_YN != 'N' AND b.project_code = #{pcode} order by b.hole_code
</select>
<select id="selectTblProjectCount" parameterType="map" resultType="egovMap">
@ -1392,7 +1416,7 @@
(select Count(distinct(hole_code)) from TBL_DOWNHOLE where hole_code like #{pcodePer})as DOWNHOLE,
(select Count(distinct(hole_code)) from TBL_DENSITY where hole_code like #{pcodePer}) as DENSITY,
(SELECT count(distinct hole_code) from TEMP_SAMPLE_INFO WHERE PROJECT_CODE = #{pcode}) AS SAMPLE_INFO,
(select Count(distinct(hole_code)) from TBL_HEADER where hole_code like #{pcodePer}) as total_count
(select Count(distinct(hole_code)) from TBL_HEADER where USE_YN != 'N' AND hole_code like #{pcodePer}) as total_count
from dual
</select>

View File

@ -21,9 +21,12 @@
</select>
<select id="selectClassDetail" parameterType="map" resultType="egovMap">
SELECT A.CLASS_DETAIL_NAME NAME, A.CLASS_DETAIL_CODE CODE
FROM TBL_CLASS_DETAIL A, TBL_PROJECT_INFO B
WHERE A.CLASS_DETAIL_CODE = B.CLASS_CODE
SELECT
A.CLASS_DETAIL_NAME NAME, A.CLASS_DETAIL_CODE CODE
FROM
TBL_CLASS_DETAIL A, TBL_PROJECT_INFO B
WHERE
B.USE_YN != 'N' AND A.CLASS_DETAIL_CODE = B.CLASS_CODE
<if test="masterCode != 0">
AND B.PROJECT_MASTER_COMPANY_CODE = #{masterCode}

View File

@ -7,10 +7,13 @@
SELECT CEIL(MAX(ROWNUM)/ #{viewPage}) AS LASTPAGE
FROM
(
SELECT A.PROJECT_CODE
FROM TBL_PROJECT_INFO A LEFT OUTER JOIN TBL_HEADER B
SELECT
A.PROJECT_CODE
FROM
TBL_PROJECT_INFO A LEFT OUTER JOIN TBL_HEADER B AND B.USE_YN != 'N'
ON A.PROJECT_CODE = B.PROJECT_CODE
WHERE NVL(A.USE_YN,' ') <> 'N'
WHERE
A.USE_YN != 'N' AND B.NVL(A.USE_YN,' ') <> 'N'
]]>
<if test="startDate != '9999'">
@ -382,7 +385,7 @@
e.hole_code
FROM
tbl_refraction_survey d
LEFT JOIN tbl_header e ON d.project_code = e.project_code)
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N')
</if>
<!-- 전기비저항탐사정보 -->
@ -392,7 +395,7 @@
e.hole_code
FROM
tbl_resistivity_survey d
LEFT JOIN tbl_header e ON d.project_code = e.project_code)
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N')
</if>
)
</if>
@ -416,9 +419,11 @@
SELECT ROW_NUMBER() OVER (ORDER BY START_DATE DESC, PROJECT_NAME) RNK,PROJECT_NAME,PROJECT_CODE, HOLE_CNT ,START_DATE, SPOT FROM (
SELECT A.PROJECT_NAME, A.PROJECT_CODE, COUNT(B.HOLE_CODE) HOLE_CNT,MAX(A.PROJECT_START_DATE) START_DATE
, 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
WHERE NVL(A.USE_YN,' ') <> 'N'
FROM
TBL_PROJECT_INFO A LEFT OUTER JOIN TBL_HEADER B
ON A.PROJECT_CODE = B.PROJECT_CODE AND B.USE_YN != 'N'
WHERE
A.USE_YN != 'N' AND NVL(A.USE_YN,' ') <> 'N'
]]>
@ -786,7 +791,7 @@
e.hole_code
FROM
tbl_refraction_survey d
LEFT JOIN tbl_header e ON d.project_code = e.project_code)
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N')
</if>
<!-- 전기비저항탐사정보 -->
@ -796,7 +801,7 @@
e.hole_code
FROM
tbl_resistivity_survey d
LEFT JOIN tbl_header e ON d.project_code = e.project_code)
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N')
</if>
)
</if>

View File

@ -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 PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -113,10 +113,10 @@
TEMP_PROJECT_INFO A,
TEMP_HEADER B
<if test='holeCode != null'>
WHERE 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 = #{holeCode}
</if>
<if test='holeCode == null'>
WHERE A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE}
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE}
</if>
</select>
@ -190,7 +190,7 @@
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId}
USE_YN != 'N' AND PROJECT_CODE = #{mId}
]]>
<![CDATA[
GROUP BY PROJECT_CODE

View File

@ -43,7 +43,7 @@
, DECODE(STATE,'6','insert') AS INS
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM TEMP_PROJECT_INFO INFO
WHERE STATE = '6'
WHERE USE_YN != 'N' AND STATE = '6'
) T
, TEMP_MANAGE_STATE OB
WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)

View File

@ -68,7 +68,7 @@
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM
TEMP_PROJECT_INFO INFO
WHERE STATE = '6'
WHERE USE_YN != 'N' AND STATE = '6'
) T
, TEMP_MANAGE_STATE OB
WHERE
@ -128,7 +128,7 @@
, DECODE(STATE,'6','insert') AS INS
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM TEMP_PROJECT_INFO INFO
WHERE STATE = '6'
WHERE USE_YN != 'N' AND STATE = '6'
) T
, TEMP_MANAGE_STATE OB
WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)

View File

@ -5,7 +5,7 @@
<select id="getHoleDistrict" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT HOLE_ADMIN_DISTRICT_SD, HOLE_ADMIN_DISTRICT_SGG, HOLE_ADMINISTRATIVE_DISTRICT
FROM TEMP_HEADER WHERE (PROJECT_CODE, HOLE_CODE) IN (
FROM TEMP_HEADER WHERE USE_YN != 'N' AND (PROJECT_CODE, HOLE_CODE) IN (
SELECT PROJECT_CODE, HOLE_CODE FROM TABLE(FUNC_HOLECODE_LIST( #{PROJECT_CODE}) ) WHERE ROWNUM = 1 )
]]>
</select>
@ -23,7 +23,7 @@
FROM
temp_header
WHERE
project_code = #{PROJECT_CODE}
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.PROJECT_CODE = B.PROJECT_CODE (+)
WHERE A.USE_YN != 'N' AND 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.PROJECT_CODE = B.PROJECT_CODE (+)
WHERE A.USE_YN != 'N' AND 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 project_code= #{PROJECT_CODE} AND ROWNUM <= 1 )
AND B.HOLE_CODE = ( select HOLE_CODE from temp_header where USE_YN != 'N' AND project_code= #{PROJECT_CODE} AND ROWNUM <= 1 )
]]>
</select>
@ -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 PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
AND HOLE_COORDINATE IS NOT NULL)
]]>
</select>
@ -103,7 +103,7 @@ WHERE SA.HOLE_COORDINATE = SB.COORDINATE_CODE
<![CDATA[
SELECT HOLE_CODE, HOLE_OR_X, HOLE_OR_Y, HOLE_LOCATION_X, HOLE_LOCATION_Y
FROM TEMP_HEADER
WHERE PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -111,14 +111,14 @@ WHERE SA.HOLE_COORDINATE = SB.COORDINATE_CODE
<![CDATA[
SELECT HOLE_CODE, HOLE_OR_X, HOLE_OR_Y, HOLE_LOCATION_X, HOLE_LOCATION_Y
FROM TEMP_HEADER
WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE <> #{HOLE_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE <> #{HOLE_CODE}
]]>
</select>
<delete id="deleteHeader" parameterType="map">
<![CDATA[
DELETE FROM TEMP_HEADER WHERE PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE}
DELETE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE}
]]>
</delete>
@ -274,7 +274,7 @@ DELETE FROM TEMP_HEADER WHERE PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE
<![CDATA[
SELECT LOCATION_EXCEPTION
FROM TEMP_PROJECT_INFO
WHERE PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -282,7 +282,7 @@ DELETE FROM TEMP_HEADER WHERE PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE
<![CDATA[
SELECT NVL(SAMPLE_INFO_EXCEPTION,'N') AS SAMPLE_INFO_EXCEPTION
FROM TEMP_PROJECT_INFO
WHERE PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -294,7 +294,7 @@ DELETE FROM TEMP_HEADER WHERE PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE
FROM
temp_header
WHERE
project_code = #{PROJECT_CODE}
USE_YN != 'N' AND project_code = #{PROJECT_CODE}
AND hole_code != #{HOLE_CODE}
]]>
</select>

View File

@ -19,7 +19,7 @@
, DECODE(STATE,'6','insert') AS INS
, PROJECT_MASTER_COMPANY_O_CODE
FROM TEMP_PROJECT_INFO INFO
WHERE STATE = '6'
WHERE 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 PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
ORDER BY HOLE_CODE
]]>
</select>
@ -59,7 +59,7 @@
SELECT PROJECT_NAME
FROM TEMP_PROJECT_INFO
WHERE PROJECT_CODE = #{PROJECT_CODE}
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
<!--//TEMP_HEADER UPDATE -->

View File

@ -135,7 +135,7 @@
NVL(REFRACTION_LINES, '0') REFRACTION_LINES,
NVL(MODUSERID, ' ') MODUSERID,
NVL2(MODDATETIME, to_char(MODDATETIME, 'yyyymmdd'), ' ') MODDATETIME
FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = #{projectCode}
FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = #{projectCode}
</select>
<select id="selectTempTopoGeology" parameterType="map" resultType="egovMap">

View File

@ -14,7 +14,7 @@
</select>
<select id="selectLayerCount" parameterType="map" resultType="egovMap">
SELECT NVL(HOLE_LAYER_NUM,'0') AS NUM_CNT FROM TEMP_HEADER WHERE PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode}
SELECT NVL(HOLE_LAYER_NUM,'0') AS NUM_CNT FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = #{projectCode} AND HOLE_CODE = #{holeCode}
</select>
<select id="selectTempLayerInfo" parameterType="map" resultType="egovMap">

View File

@ -17,8 +17,8 @@
, A.USERID
, A.DATETIME
FROM TEMP_PROJECT_INFO A LEFT OUTER JOIN TEMP_HEADER B
ON A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.STATE = '4'
ON A.PROJECT_CODE = B.PROJECT_CODE AND B.USE_YN != 'N'
WHERE 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

View File

@ -52,8 +52,9 @@
, DECODE(STATE,'2','modifycall',DECODE(STATE,'3','modifycall','')) AS MODIFYCALL
, PROJECT_MASTER_COMPANY_O_CODE
FROM TEMP_PROJECT_INFO INFO
WHERE 1=1
AND STATE in ('1','2','3','5')
WHERE
USE_YN != 'N' AND
STATE in ('1','2','3','5')
) T
, TEMP_MANAGE_STATE OB
, WEB_DATAINPUT OC

View File

@ -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 GROUP BY PROJECT_CODE
SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' GROUP BY PROJECT_CODE
UNION
SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TBL_PROJECT_INFO GROUP BY PROJECT_CODE
SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TBL_PROJECT_INFO WHERE USE_YN != 'N' GROUP BY PROJECT_CODE
)
, T3 AS (
SELECT PROJECT_CODE, COUNT(1) AS CNT FROM TEMP_TOPO_GEOLOGY GROUP BY PROJECT_CODE

View File

@ -8,15 +8,15 @@
<![CDATA[
SELECT A.HOLE_CODE, A.HOLE_OR_X, A.HOLE_OR_Y, A.HOLE_LOCATION_X, A.HOLE_LOCATION_Y, B.PROJECT_NAME
FROM TEMP_HEADER A LEFT OUTER JOIN TEMP_PROJECT_INFO B
ON A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.PROJECT_CODE = #{PROJECT_CODE}
ON B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
<select id="getTempHeader" parameterType="map" resultType="egovMap">
SELECT PROJECT_CODE
FROM TEMP_HEADER
WHERE HOLE_CODE = #{holeCode}
WHERE USE_YN != 'N' AND HOLE_CODE = #{holeCode}
</select>

View File

@ -146,8 +146,8 @@ INSERT INTO TEMP_META_INFO (
<select id="getInfo" parameterType="map" resultType="java.util.HashMap">
<![CDATA[
SELECT PROJECT_CODE, PROJECT_NAME, RESISTIVITY_LINES, REFRACTION_LINES, PROJECT_HOLE_NUMBER, USERID ,
(SELECT COUNT(*) FROM TEMP_HEADER WHERE PROJECT_CODE = #{PROJECT_CODE} ) REAL_HOLE_NUMBER FROM TEMP_PROJECT_INFO
WHERE PROJECT_CODE = #{PROJECT_CODE}
(SELECT COUNT(*) FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} ) REAL_HOLE_NUMBER FROM TEMP_PROJECT_INFO
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
<select id="getProjectMetaInfo" parameterType="map" resultType="java.util.HashMap">
@ -198,7 +198,7 @@ INSERT INTO TEMP_META_INFO (
ELSE
DECODE(NVL(PROJECT_MASTER_COMPANY_O_CODE,''),'','발주처- 필수입력<br/>','')
END PROJECT_MASTER_COMPANY
FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE= #{PROJECT_CODE}
FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE= #{PROJECT_CODE}
]]>
</select>
<select id="getTopoGeology" parameterType="map" resultType="java.util.HashMap">
@ -247,7 +247,7 @@ INSERT INTO TEMP_META_INFO (
) THEN '굴진심도- 지층정보 심도_TO 보다 작거나 같게 입력<br/>'
ELSE ''
END HOLE_TOTAL_DEPTH_ERR1
FROM TEMP_HEADER A , TABLE(FUNC_HOLECODE_LIST(#{PROJECT_CODE})) B WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE AND A.HOLE_CODE(+) = B.HOLE_CODE ORDER BY B.POSITION, B.HOLE_CODE
FROM TEMP_HEADER A , TABLE(FUNC_HOLECODE_LIST(#{PROJECT_CODE})) B WHERE A.USE_YN != 'N' AND A.PROJECT_CODE(+) = B.PROJECT_CODE AND A.HOLE_CODE(+) = B.HOLE_CODE ORDER BY B.POSITION, B.HOLE_CODE
]]>
</select>
<select id="getLayerInfo" parameterType="map" resultType="java.util.HashMap">
@ -266,14 +266,14 @@ INSERT INTO TEMP_META_INFO (
COUNT(LAYER_SCIENCE_NAME) LAYER_SCIENCE_NAME, COUNT(LAYER_SOIL_COLOR) LAYER_SOIL_COLOR, COUNT(LAYER_DESC) LAYER_DESC
,MIN(LAYER_DEPTH_TO-LAYER_DEPTH_FROM) FROMTO
FROM TEMP_LAYER_INFO WHERE PROJECT_CODE=#{PROJECT_CODE}
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_HEADER WHERE PROJECT_CODE=#{PROJECT_CODE}
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE=#{PROJECT_CODE}
AND NVL(HOLE_LAYER_NUM,0)> 0)
GROUP BY PROJECT_CODE, HOLE_CODE) A,
(SELECT
B.PROJECT_CODE, B.HOLE_CODE, B.HOLE_NAME || '(' || SUBSTR(B.HOLE_CODE,6) ||')' HOLE_FULL_NAME , NVL(CNT,0) CNT, NVL(HOLE_LAYER_NUM,0) HOLE_LAYER_NUM
FROM
(SELECT PROJECT_CODE, HOLE_CODE, COUNT(*) CNT FROM TEMP_LAYER_INFO WHERE PROJECT_CODE=#{PROJECT_CODE}
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_HEADER WHERE PROJECT_CODE=#{PROJECT_CODE} AND NVL(HOLE_LAYER_NUM,0)> 0)
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE=#{PROJECT_CODE} AND NVL(HOLE_LAYER_NUM,0)> 0)
GROUP BY PROJECT_CODE,HOLE_CODE)A, TEMP_HEADER B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
@ -301,7 +301,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND STAN_SPT='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.STAN_SPT='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
@ -333,7 +333,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE= #{PROJECT_CODE} AND STAN_TCRRQD='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE= #{PROJECT_CODE} AND AA.STAN_TCRRQD='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE= #{PROJECT_CODE} AND AA.STAN_TCRRQD='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -365,7 +365,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND STAN_DSF='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_DSF='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_DSF='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -397,7 +397,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND FIELD_PRESSUREMETER='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.FIELD_PRESSUREMETER='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.FIELD_PRESSUREMETER='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -437,7 +437,7 @@ INSERT INTO TEMP_META_INFO (
AND STAN_SLICKENSIDE='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_SLICKENSIDE='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_SLICKENSIDE='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -475,7 +475,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND STAN_Q='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_Q='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_Q='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -524,7 +524,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND STAN_RMR='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_RMR='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.STAN_RMR='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -569,7 +569,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND FIELD_WATERPRESSURE='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.FIELD_WATERPRESSURE='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
@ -605,7 +605,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND FIELD_WATERPRESSURE='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.FIELD_WATERPRESSURE='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.FIELD_WATERPRESSURE='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE}
@ -653,7 +653,7 @@ INSERT INTO TEMP_META_INFO (
AND FIELD_PERMEABLITY='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.FIELD_PERMEABLITY='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
@ -688,7 +688,7 @@ INSERT INTO TEMP_META_INFO (
AND FIELD_PERMEABLITY='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.FIELD_PERMEABLITY='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
@ -733,7 +733,7 @@ INSERT INTO TEMP_META_INFO (
AND FIELD_CONE_PENETRATION='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE= #{PROJECT_CODE} AND AA.FIELD_CONE_PENETRATION='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE= #{PROJECT_CODE} AND AA.FIELD_CONE_PENETRATION='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -778,7 +778,7 @@ INSERT INTO TEMP_META_INFO (
(
SELECT A.PROJECT_CODE, A.HOLE_CODE,B.HOLE_NAME, B.HOLE_NAME || '(' || SUBSTR(B.HOLE_CODE,6) || ')' HOLE_FULL_NAME, A.CNT FROM
(SELECT PROJECT_CODE, HOLE_CODE, COUNT(*) CNT FROM TEMP_SAMPLE_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} GROUP BY PROJECT_CODE, HOLE_CODE) A,
TEMP_HEADER B WHERE A.PROJECT_CODE = B.PROJECT_CODE AND A.HOLE_CODE = B.HOLE_CODE
TEMP_HEADER B WHERE B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND A.HOLE_CODE = B.HOLE_CODE
)A,
(
SELECT PROJECT_CODE, HOLE_CODE,
@ -816,7 +816,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND SAND_CONSOLIDATION='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.SAND_CONSOLIDATION='Y') B,
(SELECT PROJECT_CODE, HOLE_CODE, COUNT(*) DETAILCNT FROM TEMP_CONSOLIDATION WHERE PROJECT_CODE=#{PROJECT_CODE}
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND SAND_CONSOLIDATION='Y')
@ -865,7 +865,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.SAND_RESONANT='Y'
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.SAND_RESONANT='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
@ -897,7 +897,7 @@ INSERT INTO TEMP_META_INFO (
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.SAND_REPEATED_TRIAXIAL='Y'
)B
@ -932,7 +932,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.ROCK_POINTLOAD='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
@ -964,7 +964,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.ROCK_JOINTSHEAR='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
@ -997,7 +997,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.ROCK_UNIAXIAL='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
@ -1029,7 +1029,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.ROCK_TRIAXIAL='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
@ -1062,7 +1062,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.ROCK_RESONANT='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
@ -1096,7 +1096,7 @@ INSERT INTO TEMP_META_INFO (
GROUP BY PROJECT_CODE,HOLE_CODE
)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
AND AA.ROCK_REPEATED_TRIAXIAL='Y'
)B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
@ -1132,7 +1132,7 @@ INSERT INTO TEMP_META_INFO (
, COUNT(DISTINCT LINE_NUMBER) INPUT_CNT
, COUNT(B.PROJECT_CODE) TOTAL_ROW
FROM TEMP_PROJECT_INFO A , TEMP_RESISTIVITY_SURVEY_SUB B
WHERE A.PROJECT_CODE=#{PROJECT_CODE}
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=#{PROJECT_CODE}
AND A.PROJECT_CODE = B.PROJECT_CODE(+)
GROUP BY A.PROJECT_CODE
) B
@ -1163,7 +1163,7 @@ INSERT INTO TEMP_META_INFO (
, COUNT(DISTINCT LINE_NUMBER) INPUT_CNT
, COUNT(B.PROJECT_CODE) TOTAL_ROW
FROM TEMP_PROJECT_INFO A , TEMP_REFRACTION_SURVEY_SUB B
WHERE A.PROJECT_CODE=#{PROJECT_CODE}
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=#{PROJECT_CODE}
AND A.PROJECT_CODE = B.PROJECT_CODE(+)
GROUP BY A.PROJECT_CODE
) B
@ -1202,7 +1202,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND BOREHOLE_WAVE='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.BOREHOLE_WAVE='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.BOREHOLE_WAVE='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -1237,7 +1237,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND DENSITY='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.DENSITY='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND AA.DENSITY='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE})B
@ -1279,7 +1279,7 @@ INSERT INTO TEMP_META_INFO (
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE=#{PROJECT_CODE} AND DOWNHOLE='Y')
GROUP BY PROJECT_CODE,HOLE_CODE)A,
(SELECT AA.PROJECT_CODE, AA.HOLE_CODE, BB.HOLE_NAME FROM TEMP_SELECTCLASS_INFO AA, TEMP_HEADER BB
WHERE AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND DOWNHOLE='Y') B
WHERE BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE} AND DOWNHOLE='Y') B
WHERE A.PROJECT_CODE(+) = B.PROJECT_CODE
AND A.HOLE_CODE(+) = B.HOLE_CODE
AND B.PROJECT_CODE = #{PROJECT_CODE}
@ -1313,7 +1313,7 @@ INSERT INTO TEMP_META_INFO (
, SYSDATE
, (SELECT PROJECT_NAME
FROM TEMP_PROJECT_INFO
WHERE PROJECT_CODE = #{PROJECT_CODE} )
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} )
, #{STATE}
, #{FILENAME}
, #{PROJECT_CODE}
@ -1331,7 +1331,7 @@ INSERT INTO TEMP_META_INFO (
FROM
temp_project_info tpi
WHERE
REPLACE(tpi.PROJECT_NAME, ' ', '') = REPLACE(#{PROJECT_NAME}, ' ', '')
tpi.USE_YN != 'N' AND REPLACE(tpi.PROJECT_NAME, ' ', '') = REPLACE(#{PROJECT_NAME}, ' ', '')
]]>
</select>
</mapper>

View File

@ -7,9 +7,9 @@
<select id="getRegiCountAdmin" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE STATE in ('1','2','3','5')
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND STATE in ('1','2','3','5')
) AS WAIT_CNT,
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE STATE='6'
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND STATE='6'
) AS CONFIRM_CNT
FROM DUAL
]]>
@ -35,7 +35,7 @@
FROM TEMP_PROJECT_INFO A, TEMP_SMS_LOG B
WHERE
A.USERID = #{userId} AND
A.USE_YN != 'N' AND A.USERID = #{userId} AND
A.PROJECT_CODE = B.PROJECT_CODE (+)
]]>
@ -109,19 +109,19 @@
<select id="getMarray" parameterType="map" resultType="java.util.HashMap">
<![CDATA[
SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_CB_NUMBER NUM, 'CB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = #{PROJECT_CODE}
SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_CB_NUMBER NUM, 'CB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE USE_YN != '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 PROJECT_CODE =#{PROJECT_CODE}
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}
UNION ALL
SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_BB_NUMBER NUM, 'BB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE =#{PROJECT_CODE}
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}
UNION ALL
SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_TB_NUMBER NUM, 'TB' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE =#{PROJECT_CODE}
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}
UNION ALL
SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_BH_NUMBER NUM, 'BH' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE =#{PROJECT_CODE}
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}
UNION ALL
SELECT STATE, PROJECT_CODE, PROJECT_NAME, PROJECT_TESTPITT_NUMBER NUM, 'TP' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE =#{PROJECT_CODE}
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}
UNION ALL
SELECT STATE, PROJECT_CODE, PROJECT_NAME, PROJECT_ORGERBORING_NUMBER NUM, 'HA' HOLETYPE, REPORT_TYPE FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE =#{PROJECT_CODE}
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>
@ -169,7 +169,7 @@
<select id="getLines" parameterType="map" resultType="java.util.HashMap">
<![CDATA[
SELECT NVL(RESISTIVITY_LINES,0) AS RESISTIVITY_LINES, NVL(REFRACTION_LINES,0) AS REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = #{PROJECT_CODE}
SELECT NVL(RESISTIVITY_LINES,0) AS RESISTIVITY_LINES, NVL(REFRACTION_LINES,0) AS REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -177,7 +177,7 @@
<![CDATA[
SELECT
(SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_META_INFO WHERE PROJECT_CODE =#{PROJECT_CODE}) AS META_INFO,
(SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE =#{PROJECT_CODE} AND CLASS_CODE IS NOT NULL) PROJECT_INFO,
(SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_PROJECT_INFO WHERE USE_YN != '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 @@
<select id="getMenuCount02" parameterType="map" resultType="java.util.HashMap">
<![CDATA[
SELECT
(SELECT DECODE(COUNT(HOLE_LOCATION_X),1,'check','x') AS INPUT_YN FROM TEMP_HEADER WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE= #{HOLE_CODE}) AS HOLE_INFO,
(SELECT DECODE(COUNT(HOLE_LOCATION_X),1,'check','x') AS INPUT_YN FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE= #{HOLE_CODE}) AS HOLE_INFO,
(SELECT DECODE(COUNT(*),1,'check','x') AS INPUT_YN FROM TEMP_SELECTCLASS_INFO WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE= #{HOLE_CODE}) AS SELECTCLASS_INFO,
(SELECT DECODE(COUNT(*),0,'x','check') AS INPUT_YN FROM TEMP_LAYER_INFO WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE= #{HOLE_CODE}) AS LAYER_INFO,
(SELECT DECODE(COUNT(*),0,'x','check') AS INPUT_YN FROM TEMP_SAMPLE_INFO WHERE PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE= #{HOLE_CODE}) AS SAMPLE_INFO,
@ -217,7 +217,7 @@
<select id="getMenuCount03" parameterType="map" resultType="java.util.HashMap">
<![CDATA[
SELECT HOLE_CODE, 'HOLE_INFO' AS title FROM TEMP_HEADER WHERE PROJECT_CODE = #{PROJECT_CODE}
SELECT HOLE_CODE, 'HOLE_INFO' AS title FROM TEMP_HEADER WHERE USE_YN != '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
@ -511,7 +511,7 @@
, DECODE(STATE,'6','insert') AS INS
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM TEMP_PROJECT_INFO INFO
WHERE STATE = '6'
WHERE USE_YN != 'N' AND STATE = '6'
) T
, TEMP_MANAGE_STATE OB
WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)
@ -580,7 +580,7 @@ MERGE INTO TEMP_MANAGE_STATE
, B.PHONE
FROM TEMP_PROJECT_INFO A
, WEB_MEMBER_IN B
WHERE A.PROJECT_CODE = #{PROJECT_CODE}
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE = #{PROJECT_CODE}
AND A.USERID = B.USERID(+)
]]>
</select>
@ -656,7 +656,7 @@ INSERT INTO TEMP_SMS_LOG (
WHERE
]]>
<![CDATA[
PROJECT_CODE = #{mId}
USE_YN != 'N' AND PROJECT_CODE = #{mId}
]]>
<![CDATA[
ORDER BY PROJECT_CODE
@ -1416,7 +1416,7 @@ INSERT INTO TEMP_SMS_LOG (
FROM
TEMP_HEADER
WHERE
PROJECT_CODE = #{PROJECT_CODE}
USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>

View File

@ -129,7 +129,7 @@
B.HOLE_CODE,
B.HOLE_NAME
FROM TEMP_PROJECT_INFO A, TEMP_HEADER B
WHERE A.PROJECT_CODE=B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE
AND B.HOLE_CODE = #{HOLE_CODE}
]]>
</select>

View File

@ -7,7 +7,12 @@
</select>
<select id="selectTempProjectInfo" parameterType="map" resultType="egovMap">
SELECT A.PROJECT_NAME, A.PROJECT_CODE, B.HOLE_CODE, B.HOLE_NAME FROM TEMP_PROJECT_INFO A, TEMP_HEADER B WHERE A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE}
SELECT
A.PROJECT_NAME, A.PROJECT_CODE, 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 AND B.HOLE_CODE = #{HOLE_CODE}
</select>
<select id="selectCountTempSampleInfo" parameterType="map" resultType="egovMap">

View File

@ -35,8 +35,8 @@
,NVL(BOREHOLE_WAVE , 'X') AS BOREHOLE_WAVE
,NVL(DENSITY , 'X') AS DENSITY
,NVL(DOWNHOLE , 'X') AS DOWNHOLE
,(SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T.PROJECT_CODE) AS RESISTIVITY_LINES
,(SELECT CASE WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T.PROJECT_CODE) AS REFRACTION_LINES
,(SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T.PROJECT_CODE) AS RESISTIVITY_LINES
,(SELECT CASE WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T.PROJECT_CODE) AS REFRACTION_LINES
FROM TEMP_SELECTCLASS_INFO T
WHERE T.PROJECT_CODE = #{projectCode}
AND HOLE_CODE = #{holeCode}
@ -129,8 +129,8 @@
END AS HOLETYPE_NM,
REPORT_TYPE,
S1.NO
FROM TEMP_PROJECT_INFO, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE PROJECT_CODE = #{projectCode}
FROM TEMP_PROJECT_INFO TPI, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE TPI.USE_YN != 'N' AND TPI.PROJECT_CODE = #{projectCode}
)
]]>
</sql>
@ -342,8 +342,8 @@
END AS HOLETYPE_NM,
REPORT_TYPE,
S1.NO AS HOLETYPE_NO
FROM TEMP_PROJECT_INFO, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE PROJECT_CODE = #{projectCode}
FROM TEMP_PROJECT_INFO TPI, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE TPI.USE_YN != 'N' AND TPI.PROJECT_CODE = #{projectCode}
)
,ROOT AS (
SELECT T2.PROJECT_CODE,
@ -472,8 +472,8 @@
WHEN 'BOREHOLE_WAVE' THEN (SELECT NVL(BOREHOLE_WAVE , 'X') FROM TEMP_SELECTCLASS_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN 'DENSITY' THEN (SELECT NVL(DENSITY , 'X') FROM TEMP_SELECTCLASS_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN 'DOWNHOLE' THEN (SELECT NVL(DOWNHOLE , 'X') FROM TEMP_SELECTCLASS_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN 'RESISTIVITY' THEN (SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN 'REFRACTION' THEN (SELECT CASE WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN 'RESISTIVITY' THEN (SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN 'REFRACTION' THEN (SELECT CASE WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN '100' THEN 'Y'
WHEN '110' THEN 'Y'
WHEN '200' THEN 'Y'
@ -516,7 +516,7 @@
FROM TEMP_SELECTCLASS_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN '800' THEN (SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y'
WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'N' END
FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE)
FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN '900' THEN 'Y'
WHEN '910' THEN 'Y'
ELSE 'X'
@ -549,7 +549,7 @@
WHEN 'DOWNHOLE' THEN (SELECT COUNT(1) FROM TEMP_DOWNHOLE X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN 'RESISTIVITY' THEN (SELECT COUNT(1) FROM TEMP_RESISTIVITY_SURVEY X WHERE X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN 'REFRACTION' THEN (SELECT COUNT(1) FROM TEMP_REFRACTION_SURVEY X WHERE X.PROJECT_CODE = T2.PROJECT_CODE)
WHEN '100' THEN (SELECT COUNT(1) FROM TEMP_HEADER X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN '100' THEN (SELECT COUNT(1) FROM TEMP_HEADER X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN '200' THEN (SELECT COUNT(1) FROM TEMP_LAYER_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN '400' THEN (SELECT COUNT(1) FROM TEMP_SAMPLE_INFO X WHERE X.PROJECT_CODE = T2.PROJECT_CODE AND X.HOLE_CODE = T2.PROJECT_CODE||T2.HOLE_CODE)
WHEN '910' THEN (SELECT COUNT(1) FROM TEMP_EXPERT_OPINION X WHERE X.PROJECT_CODE = T2.PROJECT_CODE)
@ -625,8 +625,8 @@
END AS HOLETYPE_NM,
REPORT_TYPE,
S1.NO AS HOLETYPE_NO
FROM TEMP_PROJECT_INFO, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE PROJECT_CODE = #{projectCode}
FROM TEMP_PROJECT_INFO TPI, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE TPI.USE_YN != 'N' AND TPI.PROJECT_CODE = #{projectCode}
)
,ROOT AS (
SELECT T2.PROJECT_CODE,
@ -784,12 +784,12 @@
<select id="selectTest2" parameterType="map" resultType="egovMap">
select
(SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T.PROJECT_CODE) AS RESISTIVITY_LINES
,(SELECT CASE WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.PROJECT_CODE = T.PROJECT_CODE) AS REFRACTION_LINES
(SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T.PROJECT_CODE) AS RESISTIVITY_LINES
,(SELECT CASE WHEN NVL(REFRACTION_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE X.USE_YN != 'N' AND X.PROJECT_CODE = T.PROJECT_CODE) AS REFRACTION_LINES
,(select count(*) from temp_resistivity_survey k where k.PROJECT_CODE = T.PROJECT_CODE ) as RESISTIVITY_COUNT
,(select count(*) from temp_REFRACTION_SURVEY k where k.PROJECT_CODE = T.PROJECT_CODE ) as REFRACTION_COUNT
,(select REFRACTION_LINES from temp_project_info k WHERE k.project_code = t.project_code) as REFRACTION_LINES_COUNT
,(select RESISTIVITY_LINES from temp_project_info k WHERE k.project_code = t.project_code) as RESISTIVITY_LINES_COUNT
,(select REFRACTION_LINES from temp_project_info k WHERE k.USE_YN != 'N' AND k.project_code = t.project_code) as REFRACTION_LINES_COUNT
,(select RESISTIVITY_LINES from temp_project_info k WHERE k.USE_YN != 'N' AND k.project_code = t.project_code) as RESISTIVITY_LINES_COUNT
from TEMP_SELECTCLASS_INFO T where T.project_code = #{projectCode} AND ROWNUM =1
</select>

View File

@ -7,7 +7,7 @@
</select>
<select id="selectTotalTempSelectClassInfo" parameterType="map" resultType="egovMap">
select PROJECT_CODE FROM TEMP_PROJECT_INFO INFO WHERE STATE = '6'
select PROJECT_CODE FROM TEMP_PROJECT_INFO INFO WHERE USE_YN != 'N' AND STATE = '6'
</select>
<select id="selectTempSelectTestInfo" parameterType="map" resultType="egovMap">

View File

@ -23,7 +23,7 @@
</select>
<select id="selectTempProjectInfo" parameterType="map" resultType="java.util.LinkedHashMap">
SELECT * FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = #{PROJECT_CODE}
SELECT * FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
</select>
<select id="selectTempResistivitySurveyFile" parameterType="map" resultType="java.util.LinkedHashMap">

View File

@ -98,7 +98,7 @@ try
//
//**************************************프로젝트정보의 측선수**************************************//
strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = [PROJECT_CODE]";
strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
query = new DatabaseQuery(strQuery);
query.setParam("PROJECT_CODE", oPROJECT_CODE);
resultSet = query.execute(connection);

View File

@ -98,7 +98,7 @@ try
//
//**************************************프로젝트정보의 측선수**************************************//
strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = [PROJECT_CODE]";
strQuery = "SELECT REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
query = new DatabaseQuery(strQuery);
query.setParam("PROJECT_CODE", oPROJECT_CODE);
resultSet = query.execute(connection);

View File

@ -94,7 +94,7 @@ try
//
//**************************************프로젝트정보의 측선수**************************************//
strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = [PROJECT_CODE]";
strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
query = new DatabaseQuery(strQuery);
query.setParam("PROJECT_CODE", oPROJECT_CODE);
resultSet = query.execute(connection);

View File

@ -94,7 +94,7 @@ try
//
//**************************************프로젝트정보의 측선수**************************************//
strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE PROJECT_CODE = [PROJECT_CODE]";
strQuery = "SELECT RESISTIVITY_LINES FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = [PROJECT_CODE]";
query = new DatabaseQuery(strQuery);
query.setParam("PROJECT_CODE", oPROJECT_CODE);
resultSet = query.execute(connection);