diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
index 5bc7c5e1..8f1ecc7e 100644
--- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
@@ -1047,12 +1047,14 @@ public class OprtnInstrAdultPrflContoller {
//3. SelectPagingListQuery set 할 조건 설정
String selectCondition = new String();
+ //3.0 데이터가 있으면 모두 조회
+ selectCondition += " AND a0.user_id=b0.user_id ";
//3.1 제출 완료 후 사용중인 데이터 조회
//selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'";
- selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'";
+ //selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'";
//3.2 강사 테이블 성인강사여부 Y인것만 조회
//selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') ";
- selectCondition += "AND (b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') ";
+ //selectCondition += "AND (b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') ";
//3.3 이름 검색 시
if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){
//selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml
index dd0592ae..edf1ba65 100644
--- a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml
+++ b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ve.xml
@@ -12,7 +12,7 @@
-
+
@@ -24,5 +24,9 @@
-
+
+
+
+
+
diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Postgresql.xml
index 079c2a04..88a4e9b8 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Postgresql.xml
@@ -181,9 +181,9 @@
#aprvlCn#,
- SYSDATE,
+ NOW(),
#frstRegisterId#,
- SYSDATE,
+ NOW(),
#lastUpdusrId#,
@@ -250,9 +250,9 @@
#aprvlCn#,
- SYSDATE,
+ NOW(),
#frstRegisterId#,
- SYSDATE,
+ NOW(),
#lastUpdusrId#,
@@ -275,7 +275,7 @@
WHEN MATCHED THEN
UPDATE
SET last_updusr_id = #frstRegisterId#
- , last_updt_pnttm = SYSDATE
+ , last_updt_pnttm = NOW()
, email =#email#
@@ -326,7 +326,7 @@
/* 강사 추가 정보 VEInstrDetailDAO.selectDetail */
SELECT
- , TO_CHAR(SYSDATE,'YYYY')||'년'||TO_CHAR(SYSDATE,'MM')||'월'||TO_CHAR(SYSDATE,'DD')||'일'
+ , TO_CHAR(NOW(),'YYYY')||'년'||TO_CHAR(NOW(),'MM')||'월'||TO_CHAR(NOW(),'DD')||'일'
AS hstryPnttm
, b.desc_1 AS desc1
, b.desc_2 AS desc2
@@ -393,6 +393,7 @@
+ /* VEInstrDetailDAO.update */
UPDATE
SET
@@ -466,7 +467,8 @@
qlfct_end_yn = #qlfctEndYn#,
- qlfct_end_pnttm = #qlfctEndPnttm#,
+ /* qlfct_end_pnttm = qlfctEndPnttm, */
+ qlfct_end_pnttm = NOW(),
qlfct_end_cn = #qlfctEndCn#,
@@ -489,7 +491,7 @@
aprvl_cn = '',
- LAST_UPDT_PNTTM = SYSDATE
+ LAST_UPDT_PNTTM = NOW()
,LAST_UPDUSR_ID = #lastUpdusrId#
WHERE
@@ -583,7 +585,7 @@
#unfthYn#,
#extraPayYn#,
#rmrks#,
- SYSDATE,
+ NOW(),
#frstRegisterId#,
#rprtScore#
)
@@ -620,6 +622,7 @@
+ /* VEInstrDetailDAO.updateInstrMemo */
UPDATE
VE_INSTR_DETAIL
SET
@@ -634,6 +637,7 @@
+ /* VEInstrDetailDAO.updateInstrSigMemo */
UPDATE
VE_INSTR_DETAIL
SET
diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Postgresql.xml
new file mode 100644
index 00000000..443d2907
--- /dev/null
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_SQL_Postgresql.xml
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+ ve_instr
+
+
+
+
+ user_id,
+ tngr_instr_yn,
+ adult_instr_yn,
+ frst_regist_pnttm,
+ frst_register_id,
+ last_updt_pnttm,
+ last_updusr_id
+ , desc_1
+ , desc_2
+ , desc_3
+ , desc_4
+
+
+
+
+
+ a.user_id AS userId,
+ a.tngr_instr_yn AS tngrInstrYn,
+ a.adult_instr_yn AS adultInstrYn,
+
+ TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm,
+ a.frst_register_id AS frstRegisterId,
+ TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm,
+ a.last_updusr_id AS lastUpdusrId
+
+ , desc_1 AS desc1
+ , desc_2 AS desc2
+ , desc_3 AS desc3
+ , desc_4 AS desc4
+
+
+
+
+
+ INSERT INTO (
+
+
+ )VALUES(
+ #userId#,
+ #tngrInstrYn#,
+ #adultInstrYn#,
+ NOW(),
+ #frstRegisterId#,
+ NOW(),
+ #lastUpdusrId#
+ , #desc1#
+ , #desc2#
+ , #desc3#
+ , #desc4#
+ )
+
+
+
+
+
+
+
+ UPDATE
+
+ SET
+
+
+ user_id = #rqstId#,
+
+ LAST_UPDT_PNTTM = NOW()
+ ,LAST_UPDUSR_ID = #lastUpdusrId#
+
+
+
+ , tngr_instr_yn = #tngrInstrYn#
+
+
+
+ , adult_instr_yn = #adultInstrYn#
+
+
+
+ , desc_1 = #desc1#
+ , desc_2 = #desc2#
+ , desc_3 = #desc3#
+ , desc_4 = #desc4#
+
+
+
+ WHERE
+ user_id = #userId#
+
+
+
+
+ DELETE FROM
+
+ WHERE
+ user_id = #userId#
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Postgresql.xml
index 1b666f2d..8a75022a 100644
--- a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Postgresql.xml
@@ -70,7 +70,7 @@