From febbda1e4a530b5b8cc0558465310797a35a17b2 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 29 Aug 2025 10:02:01 +0900 Subject: [PATCH] =?UTF-8?q?2025-08-29=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B4=88=EA=B8=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/VEInstrDetailService.java | 1 + .../service/impl/VEInstrDetailDAO.java | 4 + .../impl/VEInstrDetailServiceImpl.java | 4 + .../web/CndtnPrcsInfoMngController.java | 9 +- .../web/OprtnInstrAdultPrflContoller.java | 16 +- ...-map-config-postgresql-sym-ccm-notify.xml} | 5 +- .../sql-map-config-postgresql-ve.xml | 9 +- .../notify/VEANotify_Mng_SQL_Postgresql.xml | 149 ++ .../ccm/notify/VEANotify_SQL_Postgresql.xml | 2 +- .../log/clg/EgovLoginLog_SQL_Postgresql.xml | 20 +- .../ve/edu/VEEduAplct_SQL_Postgresql.xml | 1656 +++++++++++++++++ .../ve/instr/VEInstrDetail_SQL_Postgresql.xml | 14 + ...APrcsAplctPrdInstrAsgnm_SQL_Postgresql.xml | 31 +- .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml | 2 +- .../adultVisitEdu/instrAplctMngDetail.jsp | 2 +- .../jsp/oprtn/adultVisitEdu/instrAplctReg.jsp | 2 +- 16 files changed, 1889 insertions(+), 37 deletions(-) rename src/main/resources/egovframework/sqlmap/config/postgresql/{sql-map-config-postgresql-ccm.xml => sql-map-config-postgresql-sym-ccm-notify.xml} (66%) create mode 100644 src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_Mng_SQL_Postgresql.xml diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java index b0bbf294..9d7a06cb 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java @@ -21,6 +21,7 @@ public interface VEInstrDetailService { //D int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception; + int deleteYn(VEInstrDetailVO vEInstrDetailVO) throws Exception; //L List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java index 971c63dd..104aa8ea 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java @@ -57,6 +57,10 @@ public class VEInstrDetailDAO extends EgovAbstractDAO { public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception { return delete("VEInstrDetailDAO.delete", vEInstrDetailVO); } + + public int deleteYn(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return update("VEInstrDetailDAO.deleteYn", vEInstrDetailVO); + } //L public List selectList(VEInstrDetailVO vEInstrDetailVO) throws Exception { diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java index a30cbca9..86e9ccae 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java @@ -56,6 +56,10 @@ public class VEInstrDetailServiceImpl implements VEInstrDetailService { //D public int delete(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrDetailDAO.delete(vEInstrDetailVO); + } + + public int deleteYn(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrDetailDAO.deleteYn(vEInstrDetailVO); } //List diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index 24e26219..ca74f5d3 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -2077,10 +2077,15 @@ public class CndtnPrcsInfoMngController { //3. SelectPagingListQuery set 할 조건 설정 String selectCondition = new String(); + //사용중인 경우만 + selectCondition += "AND a.use_yn = 'Y' "; + //위촉상태인 경우만 + selectCondition += "AND COALESCE(a.qlfct_end_yn, 'N') = 'N' "; + //3.1 제출 완료 후 사용중인 데이터 조회 - selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; + //selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; //3.2 강사 테이블 성인강사여부 Y인것만 조회 - selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') "; + //selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') "; //3.3 이름 검색 시 if(StringUtil.isNotEmpty(vEPrcsDetailVO.getSearchKeyword())){ //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; 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 c491e485..760004d2 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 @@ -231,8 +231,9 @@ public class OprtnInstrAdultPrflContoller { //3.1 제출 완료한 요청만 조회 // selectCondition += "AND a.sbmt_yn='Y' AND a.aprvl_Cd = '10'"; //3.2 강사 테이블 성인강사여부 Y가 아닌것만 조회(등록요청과 수정요청 둘다 코드값 10이라 강사 상세 테이블만으로는 비교 불가) - selectCondition += " AND b.adult_instr_yn !='Y' AND (a.qlfct_end_yn != 'Y' or a.qlfct_end_yn IS NULL) "; - selectCondition += " AND a.instr_div='20' "; + //selectCondition += " AND b.adult_instr_yn !='Y' AND (a.qlfct_end_yn != 'Y' or a.qlfct_end_yn IS NULL) "; + selectCondition += " AND a.instr_div='20' "; //성인강사로 등록된 대상만 이용 + selectCondition += " AND a.use_yn='Y' "; //사용처리된 강사만 보여줌 // selectCondition += " AND a.aprvl_cd=10 "; //3.3 이름 검색 시 if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ @@ -373,7 +374,7 @@ public class OprtnInstrAdultPrflContoller { //user Id는 임시 아이디 사용. 사용자에서 등록 요청 시 실제 uniqId로 업데이트 vEInstrDetailVO.setUserId(instrTempGnrService.getNextStringId()); vEInstrDetailVO.setFrstRegisterId(loginVO.getUniqId()); - vEInstrDetailVO.setUseYn("N"); + vEInstrDetailVO.setUseYn("Y"); vEInstrDetailVO.setInstrDiv("20"); VEInstrDetailVO vEInstrVO = new VEInstrDetailVO(); @@ -875,16 +876,22 @@ public class OprtnInstrAdultPrflContoller { System.out.println(vEInstrDetailVO.getUserId()); System.out.println(vEInstrDetailVO.getInstrDetailOrd()); + //강사 관리 프로세스 변경에 따라서 DB 삭제에서 use_yn='N' 처리로 변경 2025-08-28 + vEInstrDetailVO.setUseYn("N"); + vEInstrDetailService.deleteYn(vEInstrDetailVO); + + /* vEInstrDetailService.delete(vEInstrDetailVO); - vEInstrDetailVO.setInstrDiv("10"); + vEInstrDetailVO.setInstrDiv("20"); VEInstrDetailVO v_vEInstrDetailVO = vEInstrDetailService.selectDetail(vEInstrDetailVO); if (v_vEInstrDetailVO==null) { vEInstrService.delete(vEInstrDetailVO); } + */ modelAndView.addObject("result", "success"); @@ -1045,6 +1052,7 @@ public class OprtnInstrAdultPrflContoller { String selectCondition = new String(); //3.0 데이터가 있으면 모두 조회 selectCondition += " AND a0.user_id=b0.user_id "; + selectCondition += " AND a0.use_yn='Y' "; //3.1 제출 완료 후 사용중인 데이터 조회 //selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; //selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-ccm-notify.xml similarity index 66% rename from src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml rename to src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-ccm-notify.xml index 5a44c163..702a4e47 100644 --- a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-ccm.xml +++ b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-sym-ccm-notify.xml @@ -2,6 +2,7 @@ - + - \ No newline at end of file + + 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 edf1ba65..ace8504c 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 @@ -5,13 +5,16 @@ - - - + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_Mng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_Mng_SQL_Postgresql.xml new file mode 100644 index 00000000..cb437db0 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_Mng_SQL_Postgresql.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + VEA_CMM_NOTIFY_MNG + + + + + cmm_notify_mng_ord, + lctr_div_cd, + mng_user_id, + use_yn, + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + a.cmm_notify_mng_ord as cmmNotifyMngOrd, + a.lctr_div_cd as lctrDivCd, + a.mng_user_id as mngUserId, + a.use_yn as useYn, + a.frst_regist_pnttm as frstRegistPnttm, + a.frst_register_id as frstRegisterId, + a.last_updt_pnttm as lastUpdtPnttm, + a.last_updusr_id as lastUpdusrId + + + + + + + + + + + + + + /* VEANotifyMngDAO.mngInsert */ + + INSERT INTO ( + + )VALUES( + #cmmNotifyMngOrd# + ,#lctrDivCd# + ,#mngUserId# + ,'Y' + ,SYSDATE + ,#frstRegisterId# + ,'' + ,'' + ) + + + + /* VEANotifyMngDAO.mngUpdate */ + + UPDATE + + SET + lctr_div_cd = #lctrDivCd# + , mng_user_id = #mngUserId# + , last_updt_pnttm = SYSDATE + , last_updusr_id = #lastUpdusrId# + WHERE + cmm_notify_mng_ord = #cmmNotifyMngOrd# + + + + + + + /* VEANotifyMngDAO.mngDel */ + + UPDATE + + SET + use_yn = 'N' + , last_updt_pnttm = SYSDATE + , last_updusr_id = #lastUpdusrId# + WHERE + cmm_notify_mng_ord = #cmmNotifyMngOrd# + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Postgresql.xml index c5dc73fc..1cf96947 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Postgresql.xml @@ -89,7 +89,7 @@ , #eduChasiOrd# , NOW() , #frstRegisterId# - , '' + , NULL , '' , 'Y' , #params# diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml index a6a1e693..a1750ca3 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml @@ -60,7 +60,7 @@ ,#menuNm# - , SYSDATE) + , NOW()) @@ -230,7 +230,7 @@ ,( SELECT B.MENU_NM FROM LETTNPROGRMLIST A INNER JOIN LETTNMENUINFO B WHERE A.PROGRM_FILE_NM = B.PROGRM_FILE_NM AND A.URL = #url# LIMIT 1 ) - , SYSDATE) + , NOW()) @@ -679,7 +679,7 @@ , A.MENU_NO , A.MENU_NM , #url# - , SYSDATE + , NOW() FROM LETTNMENUINFO A INNER JOIN LETTNPROGRMLIST B ON A.PROGRM_FILE_NM = B.PROGRM_FILE_NM WHERE B.URL IS NOT NULL @@ -712,7 +712,7 @@ , method_nm , menu_nm , #url# - , SYSDATE + , NOW() FROM LETTNADMINMETHOD WHERE METHOD_NM = #methodNm# LIMIT 1 @@ -744,7 +744,7 @@ , '999999999' , 'MENU_NM' , #url# - , SYSDATE + , NOW() FROM DUAL @@ -776,7 +776,7 @@ , '999999999' , 'MENU_NM' , #url# - , SYSDATE + , NOW() @@ -797,7 +797,7 @@ NVL(MAX(TO_NUMBER(REPLACE(admot_id, 'ADMOTID_', ''))) + 1, 1) , #methodNm# , 'N' - , SYSDATE + , NOW() , #methodNm# , #url# , 'N' @@ -914,7 +914,7 @@ CROSS JOIN (SELECT 0 AS A UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) AS C CROSS JOIN (SELECT 0 AS A UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) AS D */ - SELECT SYSDATE - (A.A1 + (10 * B.A2) + (100 * C.A3) + (1000 * D.A4) ) AS DATES + SELECT NOW() - (A.A1 + (10 * B.A2) + (100 * C.A3) + (1000 * D.A4) ) AS DATES FROM (SELECT 0 AS A1 FROM DUAL UNION ALL SELECT 1 FROM DUAL UNION ALL SELECT 2 FROM DUAL UNION ALL SELECT 3 FROM DUAL UNION ALL SELECT 4 FROM DUAL UNION ALL SELECT 5 FROM DUAL UNION ALL SELECT 6 FROM DUAL UNION ALL SELECT 7 FROM DUAL UNION ALL SELECT 8 FROM DUAL UNION ALL SELECT 9 FROM DUAL) A ,(SELECT 0 AS A2 FROM DUAL UNION ALL SELECT 1 FROM DUAL UNION ALL SELECT 2 FROM DUAL UNION ALL SELECT 3 FROM DUAL UNION ALL SELECT 4 FROM DUAL UNION ALL SELECT 5 FROM DUAL UNION ALL SELECT 6 FROM DUAL UNION ALL SELECT 7 FROM DUAL UNION ALL SELECT 8 FROM DUAL UNION ALL SELECT 9 FROM DUAL) B ,(SELECT 0 AS A3 FROM DUAL UNION ALL SELECT 1 FROM DUAL UNION ALL SELECT 2 FROM DUAL UNION ALL SELECT 3 FROM DUAL UNION ALL SELECT 4 FROM DUAL UNION ALL SELECT 5 FROM DUAL UNION ALL SELECT 6 FROM DUAL UNION ALL SELECT 7 FROM DUAL UNION ALL SELECT 8 FROM DUAL UNION ALL SELECT 9 FROM DUAL) C @@ -1091,7 +1091,7 @@ CROSS JOIN (SELECT 0 AS A UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) AS C CROSS JOIN (SELECT 0 AS A UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) AS D ) A - WHERE A.Dates BETWEEN '2020-09-09' AND DATE_FORMAT(SYSDATE , '%Y-%m-%d') + WHERE A.Dates BETWEEN '2020-09-09' AND DATE_FORMAT(NOW() , '%Y-%m-%d') + + /* VEEduAplctDAO.findByAprvlCd */ + SELECT + + FROM ve_prcs_aplct_prd vpap + LEFT JOIN a + ON a.prcs_ord = #prcsAplctPrdOrd# + WHERE a.lctr_div_cd =#lctrDivCd# + AND a.user_id = #userId# + GROUP BY + A.EDU_APLCT_ORD , + A.LCTR_DIV_CD , + A.USER_ID , + A.PRCS_ORD , + A.EDU_SLCT_CD , + A.EDU_SLCT_AREA_CD , + A.SCHOL_INSTT_NM , + A.SCHOL_DIV_CD , + A.STNDRD_SCHOL_CD , + A.ISLTN_SCHOL_YN , + A.ADDR , + A.ADDR_DETAIL , + A.CHRG_NM , + A.CLPHONE , + A.PHONE , + A.EMAIL , + A.EDU_PLACE , + A.EDU_PLACE_CD , + A.SBMT_YN , + TO_CHAR(A.SBMT_PNTTM, 'YY-MM-DD') , + A.APRVL_CD , + TO_CHAR(A.APRVL_PNTTM, 'YY-MM-DD') , + A.APRVL_CN , + A.INSTT_NM , + A.INSTT_DIV_CD , + A.HOPE_SBJCT , + A.RQST_CN , + A.POST , + A.JOB_NM , + A.MDFY_RQST_YN , + A.EQPMN_CN , + A.BLNG , + A.DPRTM , + A.FULL_NAME , + A.PSTN , + A.PRPS , + a.txt_msg_cn , + a.e_mail_cn , + a.prvt_memo_cn , + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') , + A.FRST_REGISTER_ID , + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') , + A.LAST_UPDUSR_ID, + A.SCHOL_SEAL_ATCH_FILE_ID , + A.EDU_TRGT , + A.EDU_PRSNL , + A.EDU_CN , + A.STRT_OPRTN_DT , + A.END_OPRTN_DT , + A.RPRT_SBMT_DT , + A.TRANS_ATCH_FILE_ID , + A.USE_YN , + A.MNG_NMBR_YR , + A.MNG_NMBR_SBJCT , + A.MNG_NMBR_ORD , + A.EDU_MD , + A.OATH_ATCH_FILE_ID , + A.PLAN_ATCH_FILE_ID , + A.Attend_ATCH_FILE_ID , + A.PHT_ATCH_FILE_ID , + A.IS_WAIT , + A.CORPS_EDU , + A.BROADROOM_EDU + , A.RNDS_ORD + , A.APLCT_CN + , A.RSLT_ATCH_FILE_ID + + , A.EDU_MD_CD + , A.FEE_INSTT_CD + + ORDER BY A.EDU_APLCT_ORD DESC + LIMIT 1 + + + + + + + + + + + + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + ,FRST_REGIST_PNTTM = NOW() + + ,LCTR_DIV_CD = #lctrDivCd# + + + ,USER_ID = #userId# + + + ,PRCS_ORD = #prcsOrd# + + + ,EDU_SLCT_CD = #eduSlctCd# + + + ,EDU_SLCT_AREA_CD = #eduSlctAreaCd# + + + ,SCHOL_INSTT_NM = #scholInsttNm# + + + ,SCHOL_DIV_CD = #scholDivCd# + + + ,STNDRD_SCHOL_CD = #stndrdScholCd# + + + ,ISLTN_SCHOL_YN = #isltnScholYn# + + + , POST = #post# + + + , ADDR = #addr# + + + , ADDR_DETAIL = #addrDetail# + + + , CHRG_NM = #chrgNm# + + + , CLPHONE = #clphone# + + + , PHONE = #phone# + + + , EMAIL = #email# + + + , EDU_PLACE = #eduPlace# + + + , EDU_PLACE_CD = #eduPlaceCd# + + + , SBMT_YN = #sbmtYn# + /* + , SBMT_PNTTM = IF(SBMT_PNTTM is null, NOW(), SBMT_PNTTM) + */ + , SBMT_PNTTM = CASE WHEN SBMT_PNTTM is null THEN NOW() ELSE SBMT_PNTTM END + + + , APRVL_CD = #aprvlCd# + , APRVL_PNTTM = NOW() + + + , APRVL_CN = #aprvlCn# + + + , INSTT_NM = #insttNm# + + + , INSTT_DIV_CD = #insttDivCd# + + + , HOPE_SBJCT = #hopeSbjct# + + + , RQST_CN = #rqstCn# + + + , SCHOL_SEAL_ATCH_FILE_ID = #scholSealAtchFileId# + + + , EDU_TRGT = #eduTrgt# + + + , EDU_PRSNL = #eduPrsnl# + + + , STRT_OPRTN_DT = REPLACE(#strtOprtnDt#,'.','') + + + , END_OPRTN_DT = REPLACE(#endOprtnDt#,'.','') + + + , RPRT_SBMT_DT = REPLACE(#rprtSbmtDt#,'.','') + + + , TRANS_ATCH_FILE_ID = #transAtchFileId# + + + , USE_YN = #useYn# + + + , MNG_NMBR_YR = #mngNmbrYr# + + + , MNG_NMBR_SBJCT = #mngNmbrSbjct# + + + , MNG_NMBR_ORD = #mngNmbrOrd# + + + , JOB_NM = #jobNm# + + + , mdfy_rqst_yn = #mdfyRqstYn# + + + , BLNG = #blng# + + + , DPRTM = #dprtm# + + + , FULL_NAME = #fullName# + + + , PSTN = #pstn# + + + , PRPS = #prps# + + + + , txt_msg_cn = #txtMsgCn# + + + , e_mail_cn = #eMailCn# + + + , prvt_memo_cn = #prvtMemoCn# + + + , EDU_MD = #eduMd# + + + , EQPMN_CN = #eqpmnCn# + + + , EDU_CN = #eduCn# + + + , OATH_ATCH_FILE_ID = #oathAtchFileId# + + + , PLAN_ATCH_FILE_ID = #planAtchFileId# + + + , ATTEND_ATCH_FILE_ID = #attendAtchFileId# + + + , PHT_ATCH_FILE_ID = #phtAtchFileId# + + + , IS_WAIT = #isWait# + + + , CORPS_EDU = #corpsEdu# + + + , CORPS_EDU = '' + + + , BROADROOM_EDU = #broadroomEdu# + + + , BROADROOM_EDU = '' + + + , ADMIN_UPDT_YN = #adminUpdtYn# + + + , RNDS_ORD = #rndsOrd# + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + + /* VEEduAplctDAO.update + ve_edu_aplct = aprvl_cd (10-요청, 100-찜하기, 120-선정완료, 140-선정취소, 20-승인, 230-대기, 30-반려, 40-취소, 60-교육확정, 70-수정요청, 80-수정완료, 90-교육미확정) VE0003 + */ + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + ,LCTR_DIV_CD = #lctrDivCd# + + + ,USER_ID = #userId# + + + ,PRCS_ORD = #prcsOrd# + + + ,EDU_SLCT_CD = #eduSlctCd# + + + ,EDU_SLCT_AREA_CD = #eduSlctAreaCd# + + + ,SCHOL_INSTT_NM = #scholInsttNm# + + + ,SCHOL_DIV_CD = #scholDivCd# + + + ,STNDRD_SCHOL_CD = #stndrdScholCd# + + + ,ISLTN_SCHOL_YN = #isltnScholYn# + + + , POST = #post# + + + , ADDR = #addr# + + + , ADDR_DETAIL = #addrDetail# + + + , CHRG_NM = #chrgNm# + + + , CLPHONE = #clphone# + + + , PHONE = #phone# + + + , EMAIL = #email# + + + , EDU_PLACE = #eduPlace# + + + , EDU_PLACE_CD = #eduPlaceCd# + + + , SBMT_YN = #sbmtYn# + , SBMT_PNTTM = CASE WHEN SBMT_PNTTM IS NULL THEN NOW() ELSE SBMT_PNTTM END + + + , APRVL_CD = #aprvlCd# + , APRVL_PNTTM = NOW() + + + , APRVL_CN = #aprvlCn# + + + , INSTT_NM = #insttNm# + + + , INSTT_DIV_CD = #insttDivCd# + + + , HOPE_SBJCT = #hopeSbjct# + + + , RQST_CN = #rqstCn# + + + , SCHOL_SEAL_ATCH_FILE_ID = #scholSealAtchFileId# + + + , EDU_TRGT = #eduTrgt# + + + , EDU_PRSNL = #eduPrsnl# + + + , STRT_OPRTN_DT = REPLACE(#strtOprtnDt#,'.','') + + + , END_OPRTN_DT = REPLACE(#endOprtnDt#,'.','') + + + , RPRT_SBMT_DT = REPLACE(#rprtSbmtDt#,'.','') + + + , TRANS_ATCH_FILE_ID = #transAtchFileId# + + + , USE_YN = #useYn# + + + , MNG_NMBR_YR = #mngNmbrYr# + + + , MNG_NMBR_SBJCT = #mngNmbrSbjct# + + + , MNG_NMBR_ORD = #mngNmbrOrd# + + + , JOB_NM = #jobNm# + + + , mdfy_rqst_yn = #mdfyRqstYn# + + + , BLNG = #blng# + + + , DPRTM = #dprtm# + + + , FULL_NAME = #fullName# + + + , PSTN = #pstn# + + + , PRPS = #prps# + + + + , txt_msg_cn = #txtMsgCn# + + + , e_mail_cn = #eMailCn# + + + , prvt_memo_cn = #prvtMemoCn# + + + , EDU_MD = #eduMd# + + + , EQPMN_CN = #eqpmnCn# + + + , EDU_CN = #eduCn# + + + , OATH_ATCH_FILE_ID = #oathAtchFileId# + + + , PLAN_ATCH_FILE_ID = #planAtchFileId# + + + , ATTEND_ATCH_FILE_ID = #attendAtchFileId# + + + , PHT_ATCH_FILE_ID = #phtAtchFileId# + + + , RSLT_ATCH_FILE_ID = #rsltAtchFileId# + + + , IS_WAIT = #isWait# + + + , CORPS_EDU = #corpsEdu# + + + , CORPS_EDU = '' + + + , BROADROOM_EDU = #broadroomEdu# + + + , BROADROOM_EDU = '' + + + , ADMIN_UPDT_YN = #adminUpdtYn# + + + , RNDS_ORD = #rndsOrd# + + + , FEE_INSTT_CD = #feeInsttCd# + + + , EDU_MD_CD = #eduMdCd# + + + , APLCT_CN = #aplctCn# + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + + /* VEEduAplctDAO.updateSspnIdmtTrgtCancelNew + ve_edu_aplct = aprvl_cd (10-요청, 100-찜하기, 120-선정완료, 140-선정취소, 20-승인, 230-대기, 30-반려, 40-취소, 60-교육확정, 70-수정요청, 80-수정완료, 90-교육미확정) VE0003 + */ + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + , aprvl_cd = '20' + + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + , aprvl_cd = '30' + + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + , aprvl_cd = '60' + + + + + /* 확정 후 취소 요청 edu_state_cd=30,req_state_cd=20 */ + , aprvl_cd = '35' + + + + + /* 교육 취소 신청 승인(교육중단) edu_state_cd=60,req_state_cd=40 */ + , aprvl_cd = '40' + + + + + /* 교육 취소 신청 반려(교육계속) */ + , aprvl_cd = '60' + + + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + , IS_WAIT = #isWait# + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + + , CLPHONE = #clphone# + + + , PHONE = #phone# + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + + ,USER_ID = #userId# + ,FRST_REGISTER_ID = #userId# + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + + + + + + + + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + , SBMT_YN = #sbmtYn# + , SBMT_PNTTM = CASE WHEN #sbmtYn# = 'Y' THEN NOW() ELSE NULL END + + + , APRVL_CD = #aprvlCd# + , APRVL_PNTTM = NOW() + + + , APRVL_CN = #aprvlCn# + + + , MDFY_RQST_YN = #mdfyRqstYn# + + + , USE_YN = #useYn# + + + + , mng_nmbr = #mngNmbr# + + + , mng_nmbr_yr = #mngNmbrYr# + + + , mng_nmbr_sbjct = #mngNmbrSbjct# + + + , mng_nmbr_ord = #mngNmbrOrd# + + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + + , CHRG_NM = #chrgNm# + + + , CLPHONE = #clphone# + + + , PHONE = #phone# + + + , EMAIL = #email# + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + ,PRVT_MEMO_CN = #prvtMemoCn# + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + + + SELECT * + FROM a + WHERE 1=1 + /* + AND DATE_ADD(NOW(), INTERVAL -1 year) > a.sbmt_pnttm + */ + AND NOW()+(INTERVAL '-1' year) > a.sbmt_pnttm + + AND a.LCTR_DIV_CD = #lctrDivCd# + AND ( + a.chrg_nm IS NOT NULL + OR a.clphone IS NOT NULL + OR a.phone IS NOT NULL + OR a.email IS NOT null + ) + /* + + UPDATE ve_edu_aplct a + SET a.chrg_nm = NULL + , a.clphone = NULL + , a.phone = NULL + , a.email = null + WHERE 1=1 + AND DATE_ADD(NOW(), INTERVAL -1 YEAR) > a.sbmt_pnttm + AND a.LCTR_DIV_CD = lctrDivCd + AND + ( + a.chrg_nm IS NOT NULL + OR a.clphone IS NOT NULL + OR a.phone IS NOT NULL + OR a.email IS NOT NULL + ) + + */ + + + + + + + + + + + + + + + + + + + + /* VEEduAplctDAO.insertDocReq */ + INSERT INTO VE_EDU_DOC_REQ + ( + EDU_APLCT_ORD, + EDU_DOC_REQ_ORD, + DOC_REQ_NM, + DOC_FORM_ATCH_FILE_ID, + FRST_REGIST_PNTTM, + FRST_REGISTER_ID, + SBMT_ID + )VALUES( + #eduAplctOrd#, + #eduDocReqOrd#, + #docReqNm#, + #docFormAtchFileId#, + NOW(), + #frstRegisterId#, + #sbmtId# + ) + + + + + + + + /* VEEduAplctDAO.updateSbmtAtchFileId */ + UPDATE VE_EDU_DOC_REQ + SET + SBMT_ATCH_FILE_ID = #sbmtAtchFileId#, + SBMT_PNTTM = NOW() + WHERE + EDU_DOC_REQ_ORD = #eduDocReqOrd# + + + + INSERT INTO VEA_PRCS_APLCT_PRD_QNA + ( + PRCS_APLCT_PRD_QNA_ORD + , LCTR_DIV_CD + , QNA_REGIST + , QNA_CN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + )VALUES( + #prcsAplctPrdQnaOrd# + , #lctrDivCd# + , #qnaRegist# + , #qnaCn# + , NOW() + , #frstRegisterId# + ) + + + + /* VEEduAplctDAO.insertRslt */ + INSERT INTO VEA_RSLT_RPRT + ( + VEA_RSLT_RPRT_ORD + , EDU_APLCT_ORD + , LCTR_SBJCT + , LCTR_DAY + , LCTR_STRT_H + , LCTR_STRT_M + , LCTR_END_H + , LCTR_END_M + , LCTR_PLACE + , LCTR_TRGT + , NOS + , INSTR_NM + , ATCH_FILE_ID + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + )VALUES( + #veaRsltRprtOrd# + , #eduAplctOrd# + , #lctrSbjct# + , #lctrDay# + , #lctrStrtH# + , #lctrStrtM# + , #lctrEndH# + , #lctrEndM# + , #lctrPlace# + , #lctrTrgt# + , #nos# + , #instrNm# + , #atchFileId# + , NOW() + , #frstRegisterId# + ) + + + + + UPDATE + SET + $searchQuery$ + WHERE EDU_APLCT_ORD = #eduAplctOrd# + + 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 88a4e9b8..122a5f96 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 @@ -511,6 +511,20 @@ + + + UPDATE + + SET + use_yn = #useYn# + + WHERE + instr_div = #instrDiv# + AND user_id = #userId# + AND instr_detail_ord = #instrDetailOrd# + + + @@ -185,7 +192,7 @@ UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM SET lctr_plan_atch_file_id = #lctrPlanAtchFileId# , last_updusr_id = #lastUpdusrId# - , last_updt_pnttm = sysdate + , last_updt_pnttm = NOW() WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# AND user_id = #userId# @@ -218,7 +225,7 @@ UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM SET doc_atch_file_id = #docAtchFileId# , last_updusr_id = #lastUpdusrId# - , last_updt_pnttm = sysdate + , last_updt_pnttm = NOW() WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# AND user_id = #userId# @@ -228,7 +235,7 @@ /* VEAPrcsAplctPrdInstrAsgnmDAO.updateResetAtchFileId */ UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM - SET last_updt_pnttm = sysdate + SET last_updt_pnttm = NOW() , last_updusr_id = #lastUpdusrId# diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index f8456357..b9b335c2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -262,7 +262,7 @@ , edu_part_cd = #eduPartCd# - , nos = #nos# + , nos = CAST(#nos# AS int) , ddln_cd = (CASE WHEN #ddlnCd# = '100' THEN '' ELSE #ddlnCd# END) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp index 50496cbc..e5633226 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp @@ -206,7 +206,7 @@ function fncDelete(){ var data = new FormData(document.getElementById("detailForm")); - if(confirm("삭제 처리 하시겠습니까?")){ + if(confirm("삭제 처리 하시겠습니까?\n다시 복구할수 없습니다.")){ $.ajax({ type: "POST", enctype: 'multipart/form-data', diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp index d6b57acb..690d37e7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp @@ -157,7 +157,7 @@ $( document ).ready(function(){ if (obj) data.append("file"+idx, obj.fileObj); }); - if(confirm("강사신청을 등록 하시겠습니까?")){ + if(confirm("강사정보 등록을 하시겠습니까?")){ $.ajax({ type: "POST", enctype: 'multipart/form-data',