feat: use_yn change conditions

main
thkim 2025-01-06 19:52:38 +09:00
parent 9e773f16ac
commit 4bc15f36da
32 changed files with 387 additions and 284 deletions

View File

@ -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
# 일축압축 첨부파일 하나 씩 올리면 에러나는 버그
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

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 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()) {

View File

@ -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")))); // 현재페이지번호

View File

@ -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);

View File

@ -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<String, Object> 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<String, Object> result = surfaceService.selectTempProjectInfo(params);
if (result != null) {

View File

@ -3,9 +3,11 @@
<mapper namespace="geoinfo.com.jusangdo.service.JusangdoMapper">
<select id="selectTblHeader" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
PROJECT_CODE
FROM TBL_HEADER
WHERE USE_YN != 'N' AND HOLE_CODE = #{holeCode}
WHERE NVL(USE_YN,' ') <> 'N' AND HOLE_CODE = #{holeCode}
]]>
</select>
</mapper>

View File

@ -28,10 +28,11 @@
<!-- 입력중, 수정요청 프로젝트 -->
<select id="selectCnt" resultType="String">
<![CDATA[
SELECT COUNT(PROJECT_CODE) CNT
FROM TEMP_PROJECT_INFO
WHERE
USE_YN != 'N' AND
NVL(USE_YN,' ') <> 'N' AND
<if test="userId != null">
USERID = #{userId} AND
</if>
@ -39,6 +40,7 @@
USERID = #{userid} AND
</if>
STATE= #{state}
]]>
</select>
<!-- 시추공수 -->
@ -128,7 +130,7 @@
<select id="selectInformationInfo" parameterType="String" resultType="int">
<![CDATA[
SELECT COUNT(HOLE_CODE) CNT FROM TBL_HEADER
WHERE USE_YN != 'N' AND PROJECT_CODE IN
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE IN
(
SELECT PROJECT_CODE FROM POP_PROJECT_INFO
WHERE PROJECT_MASTER_COMPANY_CODE IN
@ -141,8 +143,9 @@
<!-- 지반정보 보유현황 view (미지정) -->
<select id="selectInformationInfoNon" parameterType="String" resultType="int">
<![CDATA[
SELECT COUNT(HOLE_CODE) CNT FROM TBL_HEADER
WHERE USE_YN != 'N' AND PROJECT_CODE IN
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE IN
(
SELECT PROJECT_CODE FROM POP_PROJECT_INFO
WHERE PROJECT_MASTER_COMPANY_CODE NOT IN
@ -150,6 +153,7 @@
${code}
)
)
]]>
</select>
@ -200,21 +204,22 @@
<![CDATA[
SELECT SUBSTR(PROJECT_START_DATE, 1, 4) YEAR
FROM TBL_PROJECT_INFO
WHERE USE_YN != 'N' AND PROJECT_START_DATE IS NOT NULL
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_START_DATE IS NOT NULL
GROUP BY SUBSTR(PROJECT_START_DATE, 1, 4)
ORDER BY YEAR
]]>
</select>
<select id="selectYearEnd" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
<![CDATA[
SELECT SUBSTR(PROJECT_START_DATE, 1, 4) YY
FROM TBL_PROJECT_INFO
WHERE USE_YN != 'N' AND PROJECT_START_DATE IS NOT NULL
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_START_DATE IS NOT NULL
<if test="_parameter != ''">
AND SUBSTR(PROJECT_START_DATE, 1, 4) >= #{_parameter }
</if>
GROUP BY SUBSTR(PROJECT_START_DATE, 1, 4)
ORDER BY YY
<![CDATA[]]>
]]>
</select>
<select id="selectSearchSitu" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
@ -225,7 +230,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 BB.USE_YN != 'N' AND AA.USE_YN != 'N' AND AA.PROJECT_CODE = BB.PROJECT_CODE
<![CDATA[WHERE NVL(BB.USE_YN,' ') <> 'N' AND NVL(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>
@ -241,7 +246,7 @@
<!-- 해당 프로젝트 코드의 시추공 가져오기 -->
<select id="selectHeaderByProjectCode" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
<![CDATA[ SELECT HOLE_CODE FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE = #{pcode} ]]>
<![CDATA[ SELECT HOLE_CODE FROM TBL_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{pcode} ]]>
</select>
<select id="userSelect" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">

View File

@ -250,7 +250,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 USE_YN != 'N' AND TRIM(PROJECT_CODE) = TRIM(A.METADATAID)
WHERE NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) = TRIM(A.METADATAID)
) AS NAMES,
(
SELECT NAME FROM WEB_DOWNLOAD_PURPOSE
@ -275,7 +275,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 USE_YN != 'N' AND TRIM(PROJECT_CODE) = TRIM(A.METADATAID)) AS PROJECTNAME,
(SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE NVL(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,
@ -300,7 +300,7 @@
<select id="selectProjectNameByPCode" resultType="String">
<![CDATA[
SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE USE_YN != 'N' AND TRIM(PROJECT_CODE) = #{pcode}
SELECT PROJECT_NAME FROM TBL_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) = #{pcode}
]]>
</select>
@ -528,8 +528,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 AND B.USE_YN != 'N'
WHERE A.USE_YN != 'N' AND A.LOCATION_EXCEPTION = 'Y'
ON A.PROJECT_CODE = B.PROJECT_CODE AND NVL(B.USE_YN,' ') <> '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
]]>

View File

@ -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}
]]>
<if test="polygonType =='circle'">
@ -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}
]]>
<if test="polygonType =='circle'">
@ -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 @@
</select>
<select id="selectDetailLastPage" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT CEIL(MAX(ROWNUM)/ #{viewPage}) AS LASTPAGE
FROM
(
@ -203,8 +204,9 @@
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.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.HOLE_CODE IN
]]>
<if test="areaHcodeArray != null and areaHcodeArray != ''">
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
@ -261,7 +263,9 @@
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.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(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=",">
@ -294,7 +298,9 @@
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
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(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'
@ -302,6 +308,7 @@
</select>
<select id="selectWebCartInfoItems" parameterType="map" resultType="egovMap">
SELECT
RNK,HOLE_CODE,
REPLACE(REPLACE(PROJECT_NAME, CHR(13), ''), CHR(10), '') as PROJECT_NAME,
@ -321,7 +328,9 @@
) 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.USE_YN != 'N' AND B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
<![CDATA[
WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(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=",">
@ -445,12 +454,12 @@
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 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}
)
) A,
@ -480,12 +489,12 @@
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 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}
)
) A,
@ -566,7 +575,7 @@
SELECT count(hole_code) as count
FROM TBL_HEADER A
<![CDATA[
WHERE USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{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}
]]>
<if test="polygonType =='circle'">
@ -586,13 +595,17 @@
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) AND PROJ.USE_YN != 'N'
<![CDATA[
LEFT OUTER JOIN TBL_PROJECT_INFO PROJ ON TRIM(HOLE.PROJECT_CODE) = TRIM(PROJ.PROJECT_CODE) AND NVL(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 B.USE_YN != 'N' AND TRIM(B.PROJECT_CODE) = TRIM(A.METADATAID(+)) AND B.PROJECT_CODE = #{metadataId}
<![CDATA[
SELECT DISTINCT A.FILEPATH, B.PROJECT_NAME FROM MTDT_SEARCH A, TBL_PROJECT_INFO B WHERE NVL(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">
@ -619,7 +632,7 @@
FROM
TBL_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
]]>
<choose>
<when test="searchTitle == 0">
@ -643,7 +656,7 @@
FROM
TBL_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
]]>
</select>
@ -670,7 +683,7 @@
</select>
<select id="selectHodeCode" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT HOLE_CODE FROM TBL_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE IN
SELECT HOLE_CODE FROM TBL_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE IN
]]>
<foreach collection="sichHole" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
@ -766,7 +779,7 @@
FROM
temp_header
WHERE
USE_YN != 'N' AND
NVL(USE_YN,' ') <> 'N' AND
project_code = #{projectCode}
]]>
</select>

View File

@ -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
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
]]>
<if test="tmX != ''">
<![CDATA[
AND HOLE_LOCATION_TM_X - 100 <= #{tmX}
@ -42,8 +43,10 @@
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
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND
]]>
A.PROJECT_CODE = B.PROJECT_CODE
<if test="tmX != ''">
<![CDATA[

View File

@ -10,14 +10,16 @@
]]>
<choose>
<when test="areaHcodeArray != null and areaHcodeArray != '' and areaHcodeArray != 'undefiend'">
where USE_YN != 'N' AND HOLE_CODE IN
<![CDATA[
where NVL(USE_YN,' ') <> 'N' AND HOLE_CODE IN
]]>
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
</foreach>
</when>
<otherwise>
<![CDATA[
WHERE USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{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}
]]>
</otherwise>
@ -32,14 +34,16 @@
]]>
<choose>
<when test="areaHcodeArray != null and areaHcodeArray != ''and areaHcodeArray != 'undefiend'">
where USE_YN != 'N' AND HOLE_CODE IN
<![CDATA[
where NVL(USE_YN,' ') <> 'N' AND HOLE_CODE IN
]]>
<foreach collection="areaHcodeArray" item="hole" index="index" open="(" close=")" separator=",">
#{hole}
</foreach>
</when>
<otherwise>
<![CDATA[
WHERE USE_YN != 'N' AND HOLE_LOCATION_TM_X >= #{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}
]]>
</otherwise>
@ -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
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(B.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}
@ -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
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND
]]>
A.PROJECT_CODE = B.PROJECT_CODE
<choose>
<when test="sido != '' and sido != null">
<![CDATA[
@ -206,8 +214,9 @@
FROM
GEOINFO.TBL_HEADER A, GEOINFO.TBL_PROJECT_INFO B
WHERE
A.USE_YN != 'N' AND
B.USE_YN != 'N' AND
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND
]]>
TRIM(A.HOLE_CODE) = (#{holeCode})
AND A.PROJECT_CODE = B.PROJECT_CODE
</select>
@ -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
]]>
<choose>
@ -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
<![CDATA[
NVL(USE_YN,' ') <> 'N' AND
]]>
TRIM(PROJECT_CODE) IN
<foreach collection="projectList" item="project" index="index" open="(" close=")" separator=",">
#{project}

View File

@ -20,7 +20,7 @@
<![CDATA[
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 NVL(A.USE_YN,' ') <> 'N'
]]>
@ -58,7 +58,7 @@
<![CDATA[
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 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} )
)
]]>
</if>
@ -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} )
)
]]>
</if>
@ -158,7 +158,7 @@
</if>
<![CDATA[
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 NVL(A.USE_YN,' ') <> 'N'
]]>
@ -212,7 +212,7 @@
</if>
<![CDATA[
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 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} )
)
]]>
</if>
@ -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} )
)
]]>
</if>
@ -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}
]]>
</select>
@ -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}
]]>
</select>
@ -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}
]]>
</select>
@ -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
]]>
</select>
@ -514,7 +514,7 @@
FROM
tbl_project_info
WHERE
USE_YN != 'N'
NVL(USE_YN,' ') <> 'N'
]]>
</select>
@ -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}
]]>
</select>
<select id="selectProjectList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
*
FROM
TBL_PROJECT_INFO
WHERE
USE_YN != 'N' AND TRIM(PROJECT_CODE) IN
NVL(USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) IN
<foreach collection="projectList" item="project" index="index" open="(" close=")" separator=",">
#{project}
</foreach>
]]>
</select>
<select id="selectWebDownloadLog" parameterType="map" resultType="egovMap">
@ -730,7 +731,7 @@
MAX(HOLE_LOCATION_TM_Y) MAXY
FROM TBL_HEADER
WHERE
USE_YN != 'N' AND
NVL(USE_YN,' ') <> 'N' AND
]]>
<if test="projectCode != null">
<![CDATA[
@ -909,7 +910,7 @@
<select id="selectSichInformationCount" parameterType="map" resultType="egovMap">
<![CDATA[
select a.*,
(SELECT SUM(QUALITY_INFORMATION) FROM TBL_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = #{pcode}) as QUALITY_INFORMATION,
(SELECT SUM(QUALITY_INFORMATION) FROM TBL_PROJECT_INFO WHERE NVL(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
@ -996,6 +997,7 @@
</select>
<select id="selectProjectInformationYn" parameterType="map" resultType="egovMap">
<![CDATA[
select b.*,
(SELECT DECODE(COUNT(*),0,'N','Y') AS CNT_YN FROM TBL_FIELD_PERMEABILITY WHERE hole_code = b.HOLE_CODE ) AS PERMEABILITY,
(SELECT DECODE(COUNT(*),0,'N','Y') AS CNT_YN FROM TBL_FIELD_PRESSUREMETER WHERE hole_code = b.HOLE_CODE ) AS PRESSUREMETER,
@ -1039,14 +1041,14 @@
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) AND a.USE_YN != 'N'
TBL_HEADER B left join tbl_project_info a on TRIM(A.PROJECT_CODE) = TRIM(B.PROJECT_CODE) AND NVL(a.USE_YN,' ') <> 'N'
where
B.USE_YN != 'N' AND a.project_code=#{pcode}) b
NVL(B.USE_YN,' ') <> 'N' AND a.project_code=#{pcode}) b
]]>
</select>
<select id="selectTblProjectInformationYn" parameterType="map" resultType="egovMap">
<![CDATA[
select
b.HOLE_CODE,
B.HOLE_TOTAL_DEPTH DEPTH,
@ -1383,10 +1385,12 @@
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.USE_YN != 'N' AND b.project_code = #{pcode} order by b.hole_code
where NVL(B.USE_YN,' ') <> 'N' AND b.project_code = #{pcode} order by b.hole_code
]]>
</select>
<select id="selectTblProjectCount" parameterType="map" resultType="egovMap">
<![CDATA[
select
(select Count(distinct(hole_code)) from tbl_SPT where hole_code like #{pcodePer}) as stan_spt,
(select Count(distinct(hole_code)) from tbl_rqd where hole_code like #{pcodePer}) as STAN_TCRRQD,
@ -1416,8 +1420,9 @@
(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 USE_YN != 'N' AND hole_code like #{pcodePer}) as total_count
(select Count(distinct(hole_code)) from TBL_HEADER where NVL(USE_YN,' ') <> 'N' AND hole_code like #{pcodePer}) as total_count
from dual
]]>
</select>

View File

@ -21,12 +21,13 @@
</select>
<select id="selectClassDetail" parameterType="map" resultType="egovMap">
<![CDATA[
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
NVL(B.USE_YN,' ') <> 'N' AND A.CLASS_DETAIL_CODE = B.CLASS_CODE
<if test="masterCode != 0">
AND B.PROJECT_MASTER_COMPANY_CODE = #{masterCode}
@ -34,6 +35,7 @@
GROUP BY A.CLASS_DETAIL_NAME , A.CLASS_DETAIL_CODE
ORDER BY A.CLASS_DETAIL_CODE
]]>
</select>
<select id="selectTblWorkCompany" parameterType="map" resultType="egovMap">

View File

@ -2,44 +2,45 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="geoinfo.map.projectSearch.service.MapProjectSearchMapper">
<select id="selectLastPage" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT CEIL(MAX(ROWNUM)/ #{viewPage}) AS LASTPAGE
SELECT CEIL(MAX(ROWNUM)/ #{viewPage}) AS LASTPAGE
FROM
(
SELECT
A.PROJECT_CODE
FROM
(
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
A.USE_YN != 'N' AND B.NVL(A.USE_YN,' ') <> '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'
]]>
<if test="startDate != '9999'">
<![CDATA[
AND (SUBSTR(A.PROJECT_START_DATE,0,4) >= #{startDate} AND SUBSTR(A.PROJECT_START_DATE,0,4) <= #{endDate})
]]>
</if>
<if test="pName != ''">
<![CDATA[
AND A.PROJECT_NAME LIKE '%' || #{pname} || '%'
]]>
</if>
<if test="comClass != 'all'">
<![CDATA[
AND A.PROJECT_WORK_COMPANY_CODE = #{comClass}
]]>
</if>
<if test="lClass != 'all'">
<![CDATA[
AND TRIM(A.CLASS_CODE) = #{lClass}
]]>
</if>
<if test="test1 == 'on' or tcr == 'on' or dsf == 'on' or slickenside == 'on' or q == 'on'
or rmr == 'on' or classification9 == 'on' or consolidation9 == 'on' or cbr == 'on'
or unconfined9 == 'on' or triaxialcu == 'on' or test2 == 'on' or waterpressure == 'on'
@ -47,74 +48,74 @@
or rocktriaxial == 'on' or repeat_triaxialcu == 'on' or resonant_usual == 'on' or repeat_rocktriaxial == 'on'
or rock_resonant_usual == 'on' or density == 'on' or downhole == 'on' or refraction_survey == 'on'
or resistivity_survey == 'on' ">
<if test="andor == 1">
<!-- 표준관입시험 -->
<if test="test1 == 'on'">
AND EXISTS (SELECT 1 FROM TBL_SPT C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- TCR -->
<if test="tcr == 'on'">
AND EXISTS (SELECT 1 FROM TBL_RQD C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- DSF -->
<if test="dsf == 'on'">
AND EXISTS (SELECT 1 FROM TBL_DSF C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 절리간격 -->
<if test="slickenside == 'on'">
AND EXISTS (SELECT 1 FROM TBL_SLICKENSIDE_INFO C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- Q -->
<if test="q == 'on'">
AND EXISTS (SELECT 1 FROM TBL_Q C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- RMR -->
<if test="rmr == 'on'">
AND EXISTS (SELECT 1 FROM TBL_RMR C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 공내재하시험 -->
<if test="test2 == 'on'">
AND EXISTS (SELECT 1 FROM TBL_FIELD_PRESSUREMETER C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 현장수압시험 -->
<if test="waterpressure == 'on'">
AND EXISTS (SELECT 1 FROM TBL_FIELD_PERMEABILITY C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 현장투수시험 -->
<if test="permeability == 'on'">
AND EXISTS (SELECT 1 FROM TBL_FIELD_WATERPRESSURE C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 점하중 -->
<if test="pointload == 'on'">
AND EXISTS (SELECT 1 FROM TBL_ROCK_POINTLOAD C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 절리면절단 -->
<if test="jointshear == 'on'">
AND EXISTS (SELECT 1 FROM TBL_ROCK_JOINTSHEAR C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 암석일축 -->
<if test="rockuniaxial == 'on'">
AND EXISTS (SELECT 1 FROM TBL_ROCK_UNIAXIAL C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 암석삼축 -->
<if test="rocktriaxial == 'on'">
AND EXISTS (SELECT 1 FROM TBL_ROCK_TRIAXIAL C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 입도분석 -->
<if test="classification9 == 'on'">
AND EXISTS (SELECT 1 FROM (
@ -128,7 +129,7 @@
)
C WHERE B.hole_code = C.hole_code )
</if>
<!-- 압밀시험 -->
<if test="consolidation9 == 'on'">
AND EXISTS (SELECT 1 FROM (
@ -142,7 +143,7 @@
)
C WHERE B.hole_code = C.hole_code )
</if>
<!-- CBR시험 -->
<if test="cbr == 'on'">
AND EXISTS (SELECT 1 FROM (
@ -156,7 +157,7 @@
)
C WHERE B.hole_code = C.hole_code )
</if>
<!-- 일축압축시험 -->
<if test="unconfined9 == 'on'">
AND EXISTS (SELECT 1 FROM (
@ -170,7 +171,7 @@
)
C WHERE B.hole_code = C.hole_code )
</if>
<!-- 삼축압축시험 -->
<if test="triaxialcu == 'on'">
AND EXISTS (SELECT 1 FROM (
@ -184,50 +185,50 @@
)
C WHERE B.hole_code = C.hole_code )
</if>
<!-- 토사_반복삼축시험 -->
<if test="repeat_triaxialcu == 'on'">
AND EXISTS (SELECT 1 FROM TBL_REPEATED_TRIAXIAL_USUAL C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 토사_공진주시험 -->
<if test="resonant_usual == 'on'">
AND EXISTS (SELECT 1 FROM TBL_RESONANT_USUAL C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 암석_반복삼축시험 -->
<if test="repeat_rocktriaxial == 'on'">
AND EXISTS (SELECT 1 FROM TBL_ROCK_REPEATED_TRIAXIAL_U C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 암석_공진주시험정보 -->
<if test="rock_resonant_usual == 'on'">
AND EXISTS (SELECT 1 FROM TBL_ROCK_RESONANT_USUAL C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 밀도검층정보 -->
<if test="density == 'on'">
AND EXISTS (SELECT 1 FROM TBL_DENSITY C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 하향식탄성파 -->
<if test="downhole == 'on'">
AND EXISTS (SELECT 1 FROM TBL_DOWNHOLE C WHERE B.HOLE_CODE = C.HOLE_CODE )
</if>
<!-- 굴절법 탄성파 -->
<if test="refraction_survey == 'on'">
AND EXISTS (SELECT 1 FROM tbl_refraction_survey C WHERE A.PROJECT_CODE = C.PROJECT_CODE )
</if>
<!-- 전기비저항탐사정보 -->
<if test="resistivity_survey == 'on'">
AND EXISTS (SELECT 1 FROM TBL_RESISTIVITY_SURVEY C WHERE A.PROJECT_CODE = C.PROJECT_CODE )
</if>
</if>
<if test="andor == 2">
AND B.HOLE_CODE IN(
SELECT '1234567890' FROM DUAL
@ -235,144 +236,144 @@
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_SPT
</if>
<!-- TCR -->
<if test="tcr == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_RQD
</if>
<!-- DSF -->
<if test="dsf == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_DSF
</if>
<!-- 절리간격 -->
<if test="slickenside == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_SLICKENSIDE_INFO
</if>
<!-- Q -->
<if test="q == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_Q
</if>
<!-- RMR -->
<if test="rmr == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_RMR
</if>
<!-- 공내재하시험 -->
<if test="test2 == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_FIELD_PRESSUREMETER
</if>
<!-- 현장수압시험 -->
<if test="waterpressure == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_FIELD_PERMEABILITY
</if>
<!-- 현장투수시험 -->
<if test="permeability == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_FIELD_WATERPRESSURE
</if>
<!-- 점하중 -->
<if test="pointload == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_POINTLOAD
</if>
<!-- 절리면절단 -->
<if test="jointshear == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_JOINTSHEAR
</if>
<!-- 암석일축 -->
<if test="rockuniaxial == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_UNIAXIAL
</if>
<!-- 암석삼축 -->
<if test="rocktriaxial == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_TRIAXIAL
</if>
<!-- 입도분석 -->
<if test="classification9 == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_CLASSIFICATION A, TBL_SAMPLE_INFO B
WHERE A.SAMPLE_CODE = B.SAMPLE_CODE
</if>
<!-- 압밀시험 -->
<if test="consolidation9 == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_CONSOLIDATION A, TBL_SAMPLE_INFO B
WHERE A.SAMPLE_CODE = B.SAMPLE_CODE
</if>
<!-- CBR시험 -->
<if test="cbr == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_CBR_COMPAC A, TBL_SAMPLE_INFO B
WHERE A.SAMPLE_CODE = B.SAMPLE_CODE
</if>
<!-- 일축압축시험 -->
<if test="unconfined9 == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_UNCONFINED_USUAL A, TBL_SAMPLE_INFO B
WHERE A.SAMPLE_CODE = B.SAMPLE_CODE
</if>
<!-- 일축압축시험 -->
<if test="triaxialcu == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_TRIAXIAL_USUAL A, TBL_SAMPLE_INFO B
WHERE A.SAMPLE_CODE = B.SAMPLE_CODE
</if>
<!-- 토사_반복삼축시험 -->
<if test="repeat_triaxialcu == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_REPEATED_TRIAXIAL_USUAL
</if>
<!-- 토사_공진주시험 -->
<if test="resonant_usual == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_RESONANT_USUAL
</if>
<!-- 암석_반복삼축시험 -->
<if test="repeat_rocktriaxial == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_REPEATED_TRIAXIAL_U
</if>
<!-- 암석_공진주시험정보 -->
<if test="rock_resonant_usual == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_ROCK_RESONANT_USUAL
</if>
<!-- 밀도검층정보 -->
<if test="density == 'on'">
UNION ALL
SELECT DISTINCT HOLE_CODE FROM TBL_DENSITY
</if>
<!-- 하향식탄성파 -->
<if test="downhole == 'on'">
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')
<![CDATA[
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND NVL(e.USE_YN,' ') <> 'N')
]]>
</if>
<!-- 전기비저항탐사정보 -->
<if test="resistivity_survey == 'on'">
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')
<![CDATA[
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND NVL(e.USE_YN,' ') <> 'N')
]]>
</if>
)
</if>
</if>
GROUP BY A.PROJECT_CODE
) A
</select>
@ -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
<![CDATA[
tbl_refraction_survey d
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N')
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND NVL(e.USE_YN,' ') <> 'N')
]]>
</if>
<!-- 전기비저항탐사정보 -->
@ -800,8 +807,10 @@
(SELECT DISTINCT
e.hole_code
FROM
<![CDATA[
tbl_resistivity_survey d
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND e.USE_YN != 'N')
LEFT JOIN tbl_header e ON d.project_code = e.project_code AND NVL(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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -113,10 +113,14 @@
TEMP_PROJECT_INFO A,
TEMP_HEADER B
<if test='holeCode != null'>
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{holeCode}
<![CDATA[
WHERE NVL(A.USE_YN,' ') <> 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{holeCode}
]]>
</if>
<if test='holeCode == null'>
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE}
<![CDATA[
WHERE NVL(A.USE_YN,' ') <> 'N' AND A.PROJECT_CODE=B.PROJECT_CODE AND B.HOLE_CODE = #{HOLE_CODE}
]]>
</if>
</select>
@ -190,7 +194,7 @@
WHERE
]]>
<![CDATA[
USE_YN != 'N' AND PROJECT_CODE = #{mId}
NVL(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 USE_YN != 'N' AND STATE = '6'
WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6'
) T
, TEMP_MANAGE_STATE OB
WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)

View File

@ -68,7 +68,9 @@
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM
TEMP_PROJECT_INFO INFO
WHERE USE_YN != 'N' AND STATE = '6'
<![CDATA[
WHERE NVL(USE_YN,' ') <> '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'
<![CDATA[
WHERE NVL(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 USE_YN != 'N' AND (PROJECT_CODE, HOLE_CODE) IN (
FROM TEMP_HEADER WHERE NVL(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
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 )
]]>
</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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
WHERE NVL(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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
WHERE NVL(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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} AND HOLE_CODE <> #{HOLE_CODE}
WHERE NVL(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 USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE}
DELETE FROM TEMP_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE =#{PROJECT_CODE} AND HOLE_CODE=#{HOLE_CODE}
]]>
</delete>
@ -274,7 +274,7 @@ DELETE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AN
<![CDATA[
SELECT LOCATION_EXCEPTION
FROM TEMP_PROJECT_INFO
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -282,7 +282,7 @@ DELETE FROM TEMP_HEADER WHERE USE_YN != 'N' AND PROJECT_CODE =#{PROJECT_CODE} AN
<![CDATA[
SELECT NVL(SAMPLE_INFO_EXCEPTION,'N') AS SAMPLE_INFO_EXCEPTION
FROM TEMP_PROJECT_INFO
WHERE USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
@ -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}
]]>
</select>

View File

@ -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
]]>
</select>
@ -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}
]]>
</select>
<!--//TEMP_HEADER UPDATE -->

View File

@ -87,6 +87,7 @@
</select>
<select id="getProjectInfo" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
NVL(CLASS_CODE, ' ') CLASS_CODE,
NVL(CLASS_DETAIL_CODE, ' ') CLASS_DETAIL_CODE,
@ -135,7 +136,8 @@
NVL(REFRACTION_LINES, '0') REFRACTION_LINES,
NVL(MODUSERID, ' ') MODUSERID,
NVL2(MODDATETIME, to_char(MODDATETIME, 'yyyymmdd'), ' ') MODDATETIME
FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND PROJECT_CODE = #{projectCode}
FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{projectCode}
]]>
</select>
<select id="selectTempTopoGeology" parameterType="map" resultType="egovMap">

View File

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

View File

@ -5,7 +5,7 @@
<!-- 관리자 리스트 -->
<select id="getRegList" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT F.* FROM (
SELECT OA.*
,(SELECT USER_NAME FROM WEB_MEMBER_IN WHERE USERID = OA.USERID) AS USER_NAME
@ -17,9 +17,10 @@
, A.USERID
, A.DATETIME
FROM TEMP_PROJECT_INFO A LEFT OUTER JOIN TEMP_HEADER B
ON A.PROJECT_CODE = B.PROJECT_CODE AND B.USE_YN != 'N'
WHERE A.USE_YN != 'N' AND A.STATE = '4'
ON A.PROJECT_CODE = B.PROJECT_CODE AND NVL(B.USE_YN,' ') <> '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 @@
<![CDATA[ AND F.USER_NAME like '%' || #{searchUserName} || '%' ]]>
</if>
ORDER BY F.PROJECT_CODE DESC
</select>

View File

@ -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

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 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

View File

@ -8,15 +8,17 @@
<![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 B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE = #{PROJECT_CODE}
ON NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
WHERE NVL(A.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = #{PROJECT_CODE}
]]>
</select>
<select id="getTempHeader" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT PROJECT_CODE
FROM TEMP_HEADER
WHERE USE_YN != 'N' AND HOLE_CODE = #{holeCode}
WHERE NVL(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 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 COUNT(*) FROM TEMP_HEADER WHERE NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{PROJECT_CODE} ) REAL_HOLE_NUMBER FROM TEMP_PROJECT_INFO
WHERE NVL(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 USE_YN != 'N' AND PROJECT_CODE= #{PROJECT_CODE}
FROM TEMP_PROJECT_INFO WHERE NVL(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.USE_YN != 'N' AND 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 NVL(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 USE_YN != 'N' AND PROJECT_CODE=#{PROJECT_CODE}
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_HEADER WHERE NVL(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 USE_YN != 'N' AND PROJECT_CODE=#{PROJECT_CODE} AND NVL(HOLE_LAYER_NUM,0)> 0)
AND HOLE_CODE IN ( SELECT HOLE_CODE FROM TEMP_HEADER WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 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 NVL(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 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 NVL(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 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 NVL(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 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 NVL(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 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 NVL(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 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 NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 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 NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 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 NVL(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 B.USE_YN != 'N' AND A.PROJECT_CODE = B.PROJECT_CODE AND A.HOLE_CODE = B.HOLE_CODE
TEMP_HEADER B WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 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'
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 BB.USE_YN != 'N' AND AA.PROJECT_CODE= BB.PROJECT_CODE AND AA.HOLE_CODE= BB.HOLE_CODE AND AA.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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.USE_YN != 'N' AND A.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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.USE_YN != 'N' AND A.PROJECT_CODE=#{PROJECT_CODE}
WHERE NVL(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 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 NVL(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 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 NVL(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 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 NVL(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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE} )
WHERE NVL(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
tpi.USE_YN != 'N' AND REPLACE(tpi.PROJECT_NAME, ' ', '') = REPLACE(#{PROJECT_NAME}, ' ', '')
NVL(tpi.USE_YN,' ') <> 'N' AND REPLACE(tpi.PROJECT_NAME, ' ', '') = REPLACE(#{PROJECT_NAME}, ' ', '')
]]>
</select>

View File

@ -7,9 +7,9 @@
<select id="getRegiCountAdmin" parameterType="map" resultType="egovMap">
<![CDATA[
SELECT
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND STATE in ('1','2','3','5')
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE NVL(USE_YN,' ') <> 'N' AND STATE in ('1','2','3','5')
) AS WAIT_CNT,
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE USE_YN != 'N' AND STATE='6'
(SELECT COUNT(*) FROM TEMP_PROJECT_INFO WHERE NVL(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.USE_YN != 'N' AND A.USERID = #{userId} AND
NVL(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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
SELECT STATE, PROJECT_CODE, PROJECT_NAME, HOLE_CB_NUMBER NUM, 'CB' 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_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}
]]>
</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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
SELECT NVL(RESISTIVITY_LINES,0) AS RESISTIVITY_LINES, NVL(REFRACTION_LINES,0) AS REFRACTION_LINES FROM TEMP_PROJECT_INFO WHERE NVL(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 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_PROJECT_INFO WHERE NVL(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 USE_YN != 'N' AND 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 NVL(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 USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
SELECT HOLE_CODE, 'HOLE_INFO' AS title FROM TEMP_HEADER WHERE NVL(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
@ -474,6 +474,7 @@
</select>
<select id="selectCompleteItems" parameterType="map" resultType="map">
<![CDATA[
SELECT
T.CLASS_CODE
, T.PROJECT_CODE
@ -511,7 +512,8 @@
, DECODE(STATE,'6','insert') AS INS
, DECODE(STATE,'6','modifycall') AS MODIFYCALL
FROM TEMP_PROJECT_INFO INFO
WHERE USE_YN != 'N' AND STATE = '6'
WHERE NVL(USE_YN,' ') <> 'N' AND STATE = '6'
]]>
) T
, TEMP_MANAGE_STATE OB
WHERE T.PROJECT_CODE = OB.PROJECT_CODE(+)
@ -580,7 +582,7 @@ MERGE INTO TEMP_MANAGE_STATE
, B.PHONE
FROM TEMP_PROJECT_INFO A
, WEB_MEMBER_IN B
WHERE A.USE_YN != 'N' AND A.PROJECT_CODE = #{PROJECT_CODE}
WHERE NVL(A.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = #{PROJECT_CODE}
AND A.USERID = B.USERID(+)
]]>
</select>
@ -656,7 +658,7 @@ INSERT INTO TEMP_SMS_LOG (
WHERE
]]>
<![CDATA[
USE_YN != 'N' AND PROJECT_CODE = #{mId}
NVL(USE_YN,' ') <> 'N' AND PROJECT_CODE = #{mId}
]]>
<![CDATA[
ORDER BY PROJECT_CODE
@ -1416,7 +1418,7 @@ INSERT INTO TEMP_SMS_LOG (
FROM
TEMP_HEADER
WHERE
USE_YN != 'N' AND PROJECT_CODE = #{PROJECT_CODE}
NVL(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.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}
]]>
</select>

View File

@ -7,12 +7,14 @@
</select>
<select id="selectTempProjectInfo" parameterType="map" resultType="egovMap">
<![CDATA[
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}
NVL(A.USE_YN,' ') <> 'N' AND NVL(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.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 CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE NVL(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 NVL(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}
@ -130,7 +130,7 @@
REPORT_TYPE,
S1.NO
FROM TEMP_PROJECT_INFO TPI, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE TPI.USE_YN != 'N' AND TPI.PROJECT_CODE = #{projectCode}
WHERE NVL(TPI.USE_YN,' ') <> 'N' AND TPI.PROJECT_CODE = #{projectCode}
)
]]>
</sql>
@ -343,7 +343,7 @@
REPORT_TYPE,
S1.NO AS HOLETYPE_NO
FROM TEMP_PROJECT_INFO TPI, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE TPI.USE_YN != 'N' AND TPI.PROJECT_CODE = #{projectCode}
WHERE NVL(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.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 'RESISTIVITY' THEN (SELECT CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE NVL(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 NVL(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.USE_YN != 'N' AND X.PROJECT_CODE = T2.PROJECT_CODE)
FROM TEMP_PROJECT_INFO X WHERE NVL(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.USE_YN != 'N' AND 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 NVL(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)
@ -626,7 +626,7 @@
REPORT_TYPE,
S1.NO AS HOLETYPE_NO
FROM TEMP_PROJECT_INFO TPI, (SELECT NO FROM SUB01 WHERE NO < 9) S1
WHERE TPI.USE_YN != 'N' AND TPI.PROJECT_CODE = #{projectCode}
WHERE NVL(TPI.USE_YN,' ') <> 'N' AND TPI.PROJECT_CODE = #{projectCode}
)
,ROOT AS (
SELECT T2.PROJECT_CODE,
@ -783,14 +783,16 @@
</select>
<select id="selectTest2" parameterType="map" resultType="egovMap">
<![CDATA[
select
(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 CASE WHEN NVL(RESISTIVITY_LINES,0) > 0 THEN 'Y' ELSE 'X' END FROM TEMP_PROJECT_INFO X WHERE NVL(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 NVL(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.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
,(select REFRACTION_LINES from temp_project_info k WHERE NVL(k.USE_YN,' ') <> 'N' AND k.project_code = t.project_code) as REFRACTION_LINES_COUNT
,(select RESISTIVITY_LINES from temp_project_info k WHERE NVL(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>
<select id="selectTest3" parameterType="map" resultType="egovMap">

View File

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

View File

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