diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Postgresql.xml index c99c5c32..200ca8d3 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Postgresql.xml @@ -29,10 +29,10 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml index 672d3ea5..427cebff 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml @@ -329,7 +329,7 @@ , addr_detail = #addrDetail# , post = #post# , email = #email# - , req_pnttm = #reqPnttm# + , req_pnttm = NOW() , vnt_year = #vntYear# , vnt_nmbr = #vntNmbr# , cmptnt_athrt = #cmptntAthrt# diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Postgresql.xml index 0a5ddb06..41676253 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Postgresql.xml @@ -43,6 +43,56 @@ /* VEEduAplctSndHstryDAO.insert */ + INSERT INTO ( + edu_aplct_ord, + snd_hstry_ord, + snd_cd, + snd_pnttm, + snd_id, + snd_cn, + trgt_id, + trgt + ) + VALUES ( + #eduAplctOrd#, + + #sndHstryOrd#, + + #sndCd#, + CURRENT_TIMESTAMP, + #sndId#, + SUBSTRING(#sndCn# FROM 1 FOR 950), + #trgtId#, + #trgt# + ) + ON CONFLICT (edu_aplct_ord, snd_hstry_ord) DO UPDATE + + SET + snd_pnttm = CURRENT_TIMESTAMP + + + , snd_cd = #sndCd# + + + , snd_id = #sndId# + + + /* + , snd_cn = sndCn + */ + , snd_cn = SUBSTRING(#sndCn# FROM 1 FOR 950) + + , trgt_id = #trgtId# + + , trgt = #trgt# + + + + + + + /* VEEduAplctSndHstryDAO.insert_old */ + MERGE INTO USING DUAL ON( diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Postgresql.xml index 2940d82e..4fbdf833 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Postgresql.xml @@ -263,6 +263,113 @@ + + /* VEEduAplctDAO.insertVeEduAplct */ + + INSERT INTO ( + edu_aplct_ord, + lctr_div_cd, + user_id, + prcs_ord, + sbmt_yn, + sbmt_pnttm, + aprvl_cd, + aprvl_pnttm, + aprvl_cn, + frst_regist_pnttm, + frst_register_id, + use_yn, + chrg_nm, + instt_nm, + d_birth, + fld, + lctr_yn, + prvs_qs, + phone, + email, + rnds_ord + ) + VALUES ( + #eduAplctOrd#, + #lctrDivCd#, + #userId#, + #prcsOrd#, + + #sbmtYn#, + NOW(), + #aprvlCd#, + NOW(), + #aprvlCn#, + + NOW(), + #frstRegisterId#, + 'Y', + #chrgNm#, + #insttNm#, + #dBirth#, + #fld#, + #lctrYn#, + #prvsQs#, + #phone#, + #email#, + #rndsOrd# + ) + + ON CONFLICT (edu_aplct_ord) + DO UPDATE SET + last_updt_pnttm = NOW() + , last_updusr_id = #frstRegisterId# + + ,LCTR_DIV_CD = #lctrDivCd# + + + ,USER_ID = #userId# + + + ,PRCS_ORD = #prcsOrd# + + + ,SBMT_YN = #sbmtYn# + ,SBMT_PNTTM = NOW() + + + ,APRVL_CD = #aprvlCd# + ,APRVL_PNTTM = NOW() + + + ,APRVL_CN = #aprvlCn# + + + ,CHRG_NM = #chrgNm# + + + ,INSTT_NM = #insttNm# + + + ,D_BIRTH = #dBirth# + + + ,FLD = #fld# + + + ,LCTR_YN = #lctrYn# + + + ,PRVS_QS = #prvsQs# + + + ,PHONE = #phone# + + + ,EMAIL = #email# + + + ,RNDS_ORD = #rndsOrd# + + + + + - - - @@ -2229,25 +2579,25 @@ FROM ( SELECT #mngNmbrYr# edu_hope_yr - + FROM DUAL )a ,( - SELECT 10 div_cd - UNION ALL SELECT 20 no1 - UNION ALL SELECT 30 no1 - UNION ALL SELECT 40 no1 - UNION ALL SELECT 60 no1 - UNION ALL SELECT 80 no1 - UNION ALL SELECT 99 no1 + SELECT 10 div_cd FROM DUAL + UNION ALL SELECT 20 no1 FROM DUAL + UNION ALL SELECT 30 no1 FROM DUAL + UNION ALL SELECT 40 no1 FROM DUAL + UNION ALL SELECT 60 no1 FROM DUAL + UNION ALL SELECT 80 no1 FROM DUAL + UNION ALL SELECT 99 no1 FROM DUAL )b ,( - SELECT 10 edu_slct_cd - UNION ALL SELECT 20 no2 - UNION ALL SELECT 99 no2 + SELECT 10 edu_slct_cd FROM DUAL + UNION ALL SELECT 20 no2 FROM DUAL + UNION ALL SELECT 99 no2 FROM DUAL )c ,( - SELECT 10 no3 - UNION ALL SELECT 20 no2 + SELECT 10 no3 FROM DUAL + UNION ALL SELECT 20 no2 FROM DUAL )d )aaaa LEFT OUTER JOIN @@ -2728,5 +3078,813 @@ , DECODE(aaaa.edu_slct_cd,'99','00',DECODE(aaaa.edu_slct_cd,'20','05',aaaa.edu_slct_cd)) + + + + + + + + + + + + + + + /* VEInstrMixDAO.deleteInstrEmailCrtfd */ + DELETE FROM VEA_INSTR_EMAIL_CRTFD + WHERE user_id = #userId# + + + + /* VEInstrMixDAO.insertInstrEmailCrtfd */ + INSERT INTO VEA_INSTR_EMAIL_CRTFD + ( + user_id, + email, + crtfd_number, + frst_regist_pnttm + ) + VALUES( + #userId#, + #email#, + #crtfdNumber#, + NOW() + ) + + + + + /* VEInstrMixDAO.insertInstrDetailActvtHstryData */ + INSERT INTO VE_INSTR_DETAIL_ACTVT_HSTRY_DATA + ( + instr_detail_actvt_hstry_ord, + user_id, + data_ord, + yr, + mnt, + de, + cn, + lrn, + frst_regist_pnttm, + frst_register_id + ) + VALUES( + #instrDetailActvtHstryOrd#, + #userId#, + #dataOrd#, + #yr#, + #mnt#, + #de#, + #cn#, + #lrn#, + NOW(), + #frstRegisterId# + ) + + + + + /* VEInstrMixDAO.deleteInstrDetailActvtHstryData */ + DELETE FROM VE_INSTR_DETAIL_ACTVT_HSTRY_DATA + WHERE data_ord = #dataOrd# + + + + + + + + + /* VEInstrMixDAO.updateInstrId */ + UPDATE SET + user_id = #rqstId# + ,last_updt_pnttm = NOW() + ,last_updusr_id = #rqstId# + WHERE user_id = #userId# + + + + /* VEInstrMixDAO.updateInstrDetailSbmtY */ + UPDATE SET + user_id = #rqstId# + ,sbmt_yn = 'Y' + ,sbmt_pnttm = NOW() + ,last_updt_pnttm = NOW() + ,last_updusr_id = #rqstId# + WHERE instr_detail_ord = #instrDetailOrd# + AND instr_div = #instrDiv# + AND user_id = #userId# + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml index 8db6406c..458aa179 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml @@ -24,24 +24,28 @@ last_updt_pnttm, last_updusr_id, lctr_div_cd, - use_yn + use_yn, + image_atch_file_id, + cn_atch_file_id - A.PRCS_ORD AS prcsOrd, - A.PRCS_DIV AS prcsDiv, - A.PRCS_KIND AS prcsKind, - A.PRCS_NM AS prcsNm, - A.PRCS_CN AS prcsCn, - A.PRCS_SORT_NO AS prcsSortNo, + A.PRCS_ORD AS prcsOrd, + A.PRCS_DIV AS prcsDiv, + A.PRCS_KIND AS prcsKind, + A.PRCS_NM AS prcsNm, + A.PRCS_CN AS prcsCn, + A.PRCS_SORT_NO AS prcsSortNo, TO_CHAR(A.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm, - A.FRST_REGISTER_ID AS frstRegisterId, + A.FRST_REGISTER_ID AS frstRegisterId, TO_CHAR(A.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm, - A.LAST_UPDUSR_ID AS lastUpdusrId, - A.LCTR_DIV_CD AS lctrDivCd, - A.USE_YN AS useYn + A.LAST_UPDUSR_ID AS lastUpdusrId, + A.LCTR_DIV_CD AS lctrDivCd, + A.USE_YN AS useYn, + A.IMAGE_ATCH_FILE_ID AS imageAtchFileId, + A.CN_ATCH_FILE_ID AS cnAtchFileId @@ -62,12 +66,15 @@ NOW(), #lastUpdusrId#, #lctrDivCd#, - #useYn# + #useYn#, + #imageAtchFileId#, + #cnAtchFileId# ) + /* VEPrcsDAO.selectList */ SELECT , B.CNT FROM A , @@ -140,6 +151,7 @@ - + /* VEPrcsDAO.selectPagingList */ SELECT COUNT(1) OVER() AS totCnt , @@ -211,6 +225,9 @@ AND a.lctr_div_cd=#lctrDivCd# + + AND COALESCE(A.USE_YN,'Y')='Y' + /*등록일시*/ @@ -222,18 +239,19 @@ AND TO_CHAR(a.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') - ORDER BY 1=1 - , CAST(a.prcs_sort_no AS INTEGER) + ORDER BY 1 + , (CAST(a.prcs_sort_no AS int) * 1) , a.prcs_ord desc , $orderByQuery$ - - - - LIMIT #recordCountPerPage# OFFSET #firstIndex# + + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; @@ -243,13 +261,17 @@ - CASE WHEN B.EDU_APLCT_ORD IS NOT NULL THEN 'Y' ELSE 'N' END AS checkYn, + IF(B.EDU_APLCT_ORD IS NOT NULL, 'Y', 'N') AS checkYn, + /* VEPrcsDAO.selectQnaPagingList */ + + SELECT + COUNT(1) OVER() AS totCnt + , qn.PRCS_APLCT_PRD_QNA_ORD as prcsAplctPrdQnaOrd + , qn.LCTR_DIV_CD as lctrDivCd + , qn.QNA_REGIST as qnaRegist + , mb.MBER_NM AS mberNm + , qn.QNA_CN as qnaCn + , qn.QNA_ANSWER_CN as qnaAnswerCn + , qn.QNA_ANSWERER as qnaAnswerer + ,TO_CHAR(qn.FRST_REGIST_PNTTM,'YYYY-MM-DD HH24:MI') AS frstRegistPnttm + , qn.FRST_REGISTER_ID as frstRegisterId + ,TO_CHAR(qn.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm + , qn.LAST_UPDUSR_ID as lastUpdusrId + FROM + VEA_PRCS_APLCT_PRD_QNA qn + LEFT JOIN LETTNGNRLMBER mb + ON qn.QNA_REGIST = mb.MBER_ID + WHERE + 1=1 + + AND qn.LCTR_DIV_CD = #lctrDivCd# + + + AND qn.QNA_CN LIKE '%' || #searchKeyword# || '%' + + + AND TO_CHAR(qn.FRST_REGIST_PNTTM, 'YYYYMMDD') = ]]> REPLACE(#searchSmbtStartDt#, '.' , '') + + + AND TO_CHAR(qn.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') + + + AND QNA_REGIST = #qnaRegist# + + + $searchQuery$ + + ORDER BY qn.FRST_REGIST_PNTTM desc + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; + + + + + + + + + /* VEPrcsDAO.qnaUpdate */ + + UPDATE VEA_PRCS_APLCT_PRD_QNA SET + QNA_ANSWER_CN = #qnaAnswerCn# + , QNA_ANSWERER = #qnaAnswerer# + , LAST_UPDUSR_ID = #lastUpdusrId# + , LAST_UPDT_PNTTM = NOW() + WHERE PRCS_APLCT_PRD_QNA_ORD = #prcsAplctPrdQnaOrd# + + + + + + + + + /* VEPrcsDAO.updateSspnIdmtTrgtCancelNew */ + UPDATE + vea_sspn_idmt_trgt + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + + /* 신청 후 취소 */ + , user_id = NULL + , edu_aplct_ord = NULL + , edu_state_cd = '10' + , prcs_aplct_prd_ord_cmplt = NULL + + + + /* 신청 후 반려 */ + , user_id = NULL + , edu_aplct_ord = NULL + , edu_state_cd = '10' + , prcs_aplct_prd_ord_cmplt = NULL + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + , edu_state_cd = '30' + , req_state_cd = '20' + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + , edu_state_cd = '30' + , req_state_cd = '20' + + + + /* 취소 신청 승은(교육중단) edu_state_cd=60,req_state_cd=40 */ + , edu_state_cd = '60' + , req_state_cd = '40' + + WHERE + sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + + + /* VEPrcsDAO.updateAplctDetailInfo */ + UPDATE VEA_APLCT_DETAIL_INFO + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + + /* 신청 후 관리자 반려 aplct_state_cd=50 */ + , aplct_state_cd = null + + + + + /* 신청 후 관리자 반려 aplct_state_cd=50 */ + , aplct_state_cd = '50' + + + + WHERE + edu_aplct_ord = #eduAplctOrd# + + + + + /* VEPrcsDAO.deleteAplctDetailInfo */ + DELETE FROM VEA_APLCT_DETAIL_INFO + WHERE + edu_aplct_ord = #eduAplctOrd# + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngDetail.jsp index 71f546f6..3210de8a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngDetail.jsp @@ -307,7 +307,8 @@ - +<%-- --%> +