From ce677b8d0dcf1bdb4c08a688c7c17099585708d0 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 2 Sep 2025 09:40:40 +0900 Subject: [PATCH] =?UTF-8?q?2025-09-02=20=EA=B0=95=EC=82=AC=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EgovMenuCreateManageService.java | 3 +- .../impl/EgovMenuCreateManageServiceImpl.java | 3 +- .../mcm/service/impl/MenuCreateManageDAO.java | 5 +- .../web/EgovMenuCreateManageController.java | 10 +- .../sql-map-config-postgresql-ve.xml | 1 + .../log/clg/EgovLoginLog_SQL_Postgresql.xml | 5 +- .../mnu/mcm/EgovMenuCreat_SQL_Postgresql.xml | 11 +- .../mnu/mpm/EgovMainMenu_SQL_Postgresql.xml | 6 +- .../mnu/mpm/EgovMenuManage_SQL_Postgresql.xml | 33 ++- .../uss/ion/cnt/CntManage_SQL_Postgresql.xml | 6 +- .../cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml | 2 + .../edu/VEEduAplctSndHstry_SQL_Postgresql.xml | 257 ++++++++++++++++++ .../WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreat.jsp | 2 +- .../jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp | 12 +- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 16 +- 15 files changed, 342 insertions(+), 30 deletions(-) create mode 100644 src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Postgresql.xml diff --git a/src/main/java/kcc/let/sym/mnu/mcm/service/EgovMenuCreateManageService.java b/src/main/java/kcc/let/sym/mnu/mcm/service/EgovMenuCreateManageService.java index e20a2a29..e0cecf97 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/service/EgovMenuCreateManageService.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/service/EgovMenuCreateManageService.java @@ -2,6 +2,7 @@ package kcc.let.sym.mnu.mcm.service; import java.util.List; +import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.com.cmm.ComDefaultVO; import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; import kcc.let.sym.mnu.mpm.service.MenuManageVO; @@ -65,7 +66,7 @@ public interface EgovMenuCreateManageService { * @return List * @exception Exception */ - List selectMenuCreatList(MenuCreatVO vo) throws Exception; + List selectMenuCreatList(MenuCreatVO vo) throws Exception; /** diff --git a/src/main/java/kcc/let/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java b/src/main/java/kcc/let/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java index bd2eb70d..873f1cee 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java @@ -7,6 +7,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.com.cmm.ComDefaultVO; import kcc.let.sym.mnu.mcm.service.EgovMenuCreateManageService; import kcc.let.sym.mnu.mcm.service.MenuCreatVO; @@ -55,7 +56,7 @@ public class EgovMenuCreateManageServiceImpl extends EgovAbstractServiceImpl imp * @exception Exception */ @Override - public List selectMenuCreatList(MenuCreatVO vo) throws Exception { + public List selectMenuCreatList(MenuCreatVO vo) throws Exception { return menuCreateManageDAO.selectMenuCreatList(vo); } diff --git a/src/main/java/kcc/let/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java b/src/main/java/kcc/let/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java index b6741f36..98e31e00 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.com.cmm.ComDefaultVO; import kcc.let.sym.mnu.mcm.service.MenuCreatVO; import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; @@ -79,8 +80,8 @@ public class MenuCreateManageDAO extends EgovAbstractDAO{ * @return List * @exception Exception */ - public List selectMenuCreatList(MenuCreatVO vo) throws Exception{ - return list("menuManageDAO.selectMenuCreatList_D", vo); + public List selectMenuCreatList(MenuCreatVO vo) throws Exception{ + return (List) list("menuManageDAO.selectMenuCreatList_D", vo); } /** diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index ba281665..57e1bc76 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.property.EgovPropertyService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.ComDefaultVO; @@ -181,9 +182,16 @@ public class EgovMenuCreateManageController { }*/ //관리자 매뉴만 보이게 // menuCreatVO.setUnderMenuNo("9000000"); //MENU_NO < 9900000 - List list_menulist = menuCreateManageService.selectMenuCreatList(menuCreatVO) ; + //List list_menulist = menuCreateManageService.selectMenuCreatList(menuCreatVO) ; + List list_menulist = menuCreateManageService.selectMenuCreatList(menuCreatVO) ; model.addAttribute("list_menulist", list_menulist ); model.addAttribute("resultVO", menuCreatVO); + + System.out.println(list_menulist.size()); + System.out.println(list_menulist.size()); + System.out.println(list_menulist.size()); + + //return "sym/mnu/mcm/EgovMenuCreat"; return "sym/mnu/mcm/EgovMenuCreat"; } 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 ace8504c..4f33ccdc 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 @@ -6,6 +6,7 @@ + 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 a1750ca3..6ffcf19f 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 @@ -745,7 +745,9 @@ , 'MENU_NM' , #url# , NOW() + /* FROM DUAL + */ @@ -794,7 +796,8 @@ ) SELECT - NVL(MAX(TO_NUMBER(REPLACE(admot_id, 'ADMOTID_', ''))) + 1, 1) + /* NVL(MAX(TO_NUMBER(REPLACE(admot_id, 'ADMOTID_', ''))) + 1, 1) */ + COALESCE(MAX(cast(replace(admot_id, 'ADMOTID_', '') as int)) + 1, 1) , #methodNm# , 'N' , NOW() diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Postgresql.xml index 5815dbb6..ba195f64 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Postgresql.xml @@ -51,16 +51,17 @@ \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Postgresql.xml index 84e8011d..e8532732 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Postgresql.xml @@ -176,6 +176,7 @@ + /* menuManageDAO.updateMenuManage_S */ - + + /* menuManageDAO.updateMenuManageJtree */ UPDATE LETTNMENUINFO SET MENU_ORDR = #menuOrdr# @@ -275,7 +277,7 @@ , EMPLYR_ID = #emplyrId# , MENU_NO = #menuNo# - WHERE MENU_NO=#tmp_Id# + WHERE CAST(MENU_NO AS VARCHAR)=#tmp_Id# @@ -289,7 +291,8 @@ ]]> - + + /* menuManageDAO.resortMenuManage_old */ UPDATE LETTNMENUINFO A , ( SELECT ROW_NUMBER() OVER(ORDER BY MENU_ORDR, LAST_UPDT_PNTTM @@ -304,7 +307,30 @@ WHERE A.MENU_NO = B.MENU_NO + + /* menuManageDAO.resortMenuManage */ + UPDATE LETTNMENUINFO A + SET MENU_ORDR = B.SORT1 + FROM ( + SELECT + ROW_NUMBER() OVER ( + ORDER BY A.MENU_ORDR, A.LAST_UPDT_PNTTM + + DESC + + ) AS SORT1, + A.MENU_NO + FROM LETTNMENUINFO A + LEFT JOIN LETTNMENUCREATDTLS B ON A.MENU_NO = B.MENU_NO + WHERE A.UPPER_MENU_NO = #upperMenuId# + AND B.AUTHOR_CODE = #authorCode# + ) B + WHERE A.MENU_NO = B.MENU_NO + + + + /* menuManageDAO.updateMenuManageJtreeLevelNo */ + /* menuManageDAO.updateMenuManageJtreeMove */ + /* cntManageDAO.updateCntManageBeforeN */ + /* cntManageDAO.deleteCntManage */ + /* cntManageDAO.updateMenuContent */ + /* cntManageDAO.deleteMenuNo */ 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 51b01e6f..672d3ea5 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 @@ -756,6 +756,8 @@ OR a.edu_state_cd = '35' /* 교육신청반려*/ OR a.edu_state_cd = '50' /* 연기 */ OR a.edu_state_cd = '70' /* 재교육 */ + OR a.edu_state_cd IS NULL /* 값없음 */ + OR a.edu_state_cd = '' /* 값없음 */ ) AND a.prcs_aplct_prd_ord_cmplt IS NULL /* 병합되지 않았다. */ 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 new file mode 100644 index 00000000..0a5ddb06 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplctSndHstry_SQL_Postgresql.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + VE_EDU_APLCT_SND_HSTRY + + + + + EDU_APLCT_ORD, + snd_hstry_ord, + + snd_cd, + snd_pnttm, + snd_id, + snd_cn, + trgt_id, + trgt + + + + + A.EDU_APLCT_ORD AS eduAplctOrd, + a.snd_hstry_ord AS sndHstryOrd, + + a.snd_cd AS sndCd, + TO_CHAR(a.snd_pnttm,'YYYY-MM-DD') AS sndPnttm, + + a.snd_id AS sndId, + a.snd_cn AS sndCn + + + + + + + + /* VEEduAplctSndHstryDAO.insert */ + + MERGE INTO + USING DUAL + ON( + EDU_APLCT_ORD = #eduAplctOrd# + AND SND_HSTRY_ORD = #sndHstryOrd# + ) + + WHEN NOT MATCHED THEN + INSERT + ( + + ) + VALUES( + #eduAplctOrd#, + + #sndHstryOrd#, + + #sndCd#, + SYSDATE, + #sndId#, + SUBSTR(#sndCn#,0,950), + #trgtId#, + #trgt# + /* + sndCn + */ + + + + ) + WHEN MATCHED THEN + UPDATE + SET + snd_pnttm = SYSDATE + + + , snd_cd = #sndCd# + + + , snd_id = #sndId# + + + /* + , snd_cn = sndCn + */ + , snd_cn = SUBSTR(#sndCn#,0,950) + + , trgt_id = #trgtId# + + , trgt = #trgt# + + + + + + + + + + UPDATE + SET + + snd_hstry_ord = #sndHstryOrd# + + + + + , snd_cd = #sndCd# + + , snd_pnttm = #sndPnttm# + + , snd_id = #sndId# + + , snd_cn = #sndCn# + + + WHERE EDU_APLCT_ORD = #eduAplctOrd# + AND SND_HSTRY_ORD = #sndHstryOrd# + + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + AND SND_HSTRY_ORD = #sndHstryOrd# + + + + + + + + + + + UPDATE + SET + LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + + , SBMT_YN = #sbmtYn# + , SBMT_PNTTM = IF(#sbmtYn# = 'Y', NOW(), NULL) + + + , APRVL_CD = #aprvlCd# + , APRVL_PNTTM = NOW() + + + , APRVL_CN = #aprvlCn# + + + , USE_YN = #useYn# + + 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# + + + + + /* VEEduAplctSndHstryDAO.insertInstrChkNo */ + INSERT INTO + ( + + ) + VALUES + ( + '강사 등록 인증메일', + #sndHstryOrd#, + '20', + SYSDATE, + #sndId#, + SUBSTR(#sndCn#,0,950), + #trgtId#, + #trgt# + ) + + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreat.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreat.jsp index 8595b272..d2b29b43 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreat.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreat.jsp @@ -159,7 +159,7 @@ function jstreeRefresh() {
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp index 0b48fc40..d328bba8 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp @@ -130,16 +130,16 @@ function selectMenuCreat(vAuthorCode) { //메뉴생성 화면 호출 - - - + + + - Y - N + Y + N <%-- --%> - '); return false;"> + '); return false;"> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 2879e492..e57c65d7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -85,6 +85,7 @@ $(document).ready(function(){ }); // 리스트 상태값 확인 + /* $(".ddlnCdStts").each(function() { var $thisCell = $(this); var $applyButton = $thisCell.closest('tr').find(".aplctBtn button"); @@ -164,19 +165,21 @@ $(document).ready(function(){ } - /* 24.01.22 웹접근성 검사를 위하여 disabled 사용제외 */ + // 24.01.22 웹접근성 검사를 위하여 disabled 사용제외 if($applyButton.prop('disabled')){ $applyButton.removeAttr('onclick'); $applyButton.prop('disabled', false); $applyButton.css('background-color', '#888'); - /*24.01.23 웹접근성 검사를 위하여 title 추가*/ + //*24.01.23 웹접근성 검사를 위하여 title 추가* $applyButton.attr('title','비활성화됨'); $applyButton.removeAttr('data-tooltip'); } }); + */ // 리스트 상태값 확인 + /* $(".ddlnCdSttsM").each(function() { var $thisCell = $(this); var $applyButton = $thisCell.closest('ul').find(".aplctBtnM button"); @@ -255,17 +258,18 @@ $(document).ready(function(){ } - /* 24.01.22 웹접근성 검사를 위하여 disabled 사용제외 */ + /* 24.01.22 웹접근성 검사를 위하여 disabled 사용제외 * if($applyButton.prop('disabled')){ $applyButton.removeAttr('onclick'); $applyButton.prop('disabled', false); $applyButton.css('background-color', '#888'); - /*24.01.23 웹접근성 검사를 위하여 title 추가*/ + /*24.01.23 웹접근성 검사를 위하여 title 추가* $applyButton.attr('title','비활성화됨'); $applyButton.removeAttr('data-tooltip'); } }); + */ const dBirth = document.querySelector(".dBirth"); dBirth.localization = { @@ -388,7 +392,7 @@ $(document).ready(function(){ var data ={ "prcsAplctPrdOrd": prcsAplctPrdOrd, "eduAplctOrd": eduAplctOrd - } + } commonPopLayeropen( "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduAplctPop.do" @@ -594,7 +598,7 @@ $(document).ready(function(){ + onclick="fn_eduRegPopup('', '');" title="팝업 열림">신청