From 7ec9d6f39a66bafb395c97e57f022b90999a0a03 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 20 Oct 2023 10:48:49 +0900 Subject: [PATCH 1/4] =?UTF-8?q?2023-10-20=2010:47=20=EC=A7=80=EC=97=AD=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uss/umt/EgovUserManage_SQL_Tibero.xml | 18 +++++++++--------- .../sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml | 16 +++++++++++++--- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml index e9c0b16f..8223ee94 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml @@ -245,7 +245,7 @@ #orgnztId# , #insttCode# , #emplyrSttusCode# , - NOW() , + SYSDATE , #partIdx# , @@ -282,7 +282,7 @@ , 'Y' , #moblphonNo# , NULL - , NOW() + , SYSDATE , #uniqId# , NULL , #mberSeq# @@ -314,12 +314,12 @@ , #emplyrSttusCode# , #moblphonNo# , NULL - , NOW() + , SYSDATE , #uniqId# , NULL , #mberSeq# - , NOW() - , NOW() + , SYSDATE + , SYSDATE ) @@ -500,7 +500,7 @@ PSTINST_CODE , EMPLYR_STTUS_CODE , ESNTL_ID , - now() + SYSDATE FROM LETTNEMPLYRINFO WHERE ESNTL_ID = #uniqId# ]]> @@ -630,7 +630,7 @@ #emailYN#, #smsYN#, #photofileId#, - NOW() ) + SYSDATE ) ]]> @@ -698,7 +698,7 @@ #emailYN#, #smsYN#, #photofileId#, - now() + SYSDATE ) @@ -784,7 +784,7 @@ #snsId# , #snsEmail# , - now() + SYSDATE ) diff --git a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml index 35b7eef4..f240aa30 100644 --- a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml @@ -68,7 +68,7 @@ @@ -280,7 +286,11 @@ ) ) + /* WHERE TRIM(aa.twoDepthNm) !='' + */ + + WHERE LENGTH(TRIM(aa.twoDepthNm))>0 From 2965e87a655943f68d51b698da469e58e832de39 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 20 Oct 2023 11:57:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?2023-10-20=2011:57=20=EC=84=B1=EC=9D=B8=20?= =?UTF-8?q?=EC=B0=BE=EA=B5=90=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adultVisitEdu/eduAplct/eduAplctDetail.jsp | 33 +++++++++++++++++- .../adultVisitEdu/eduAplct/eduAplctReg.jsp | 12 ++++++- .../adultVisitEdu/eduEnd/eduEndDetail.jsp | 34 +++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp index bf9b3522..fccf5de3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp @@ -134,6 +134,8 @@ $('#info_apptYr').text(info.apptYr); $('#info_actvtCarer').text(info.actvtCarer); $('#info_mnLctrCn').text(info.mnLctrCn); + + $('#info_prfsnFld').text(info.prfsnFld); } ,error:function(request , status, error){ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); @@ -218,6 +220,7 @@

+ + + + + +

전문분야

+ + +

+ + + @@ -467,6 +484,20 @@ ${info.email} + + +

신청내용

+ + + + + + + + + + +

희망주제

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 1c57a47b..f0594926 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -645,7 +645,17 @@ - + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index c94a08f8..262c5e3f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -366,6 +366,9 @@ $('#info_apptYr').text(info.apptYr); $('#info_actvtCarer').text(info.actvtCarer); $('#info_mnLctrCn').text(info.mnLctrCn); + + $('#info_prfsnFld').text(info.prfsnFld); + } ,error:function(request , status, error){ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); @@ -450,6 +453,7 @@

+ + + + + +

전문분야

+ + +

+ + + + @@ -952,6 +972,20 @@ ${info.email} + + +

신청내용

+ + + + + + + + + + +

희망주제

From c92e1dc429b2f1fdb129bad292e50288e5e3bed7 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 20 Oct 2023 12:24:54 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20e?= =?UTF-8?q?=EB=B0=B0=EC=9B=80=ED=84=B0=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=8B=9C=20SSO=EC=84=B8=EC=85=98=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/uat/uia/web/APILoginContoller.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index cecd9dd5..a0aa4e30 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -33,6 +33,7 @@ import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import kcc.com.cmm.LoginVO; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.let.uat.uia.service.EgovLoginService; +import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.umt.service.EgovUserManageService; import kcc.let.uss.umt.service.UserManageVO; import kcc.let.utl.sim.service.EgovClntInfo; @@ -113,12 +114,16 @@ public class APILoginContoller { loginVO.setIp(EgovClntInfo.getClntIP(request)); LoginVO resultVO = loginService.APIActionLogin(loginVO); + //23.10.19 - SSO세션 추가. 개발자 로그인을 위해 SSO세션 사용 유지 + SsoLoginVO ssoLoginVO = new SsoLoginVO(); + /*ssoLoginVO.setOtherUser("Y");*/ + ssoLoginVO.setMembSeq("1"); if (loginService.getUserAuth(resultVO) != null) { resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority()); } resultVO.setUrl(returnUrl); request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성 - request.getSession().setAttribute("SSOLoginVO", resultVO); // SSOLogin세션 사용 유지 + request.getSession().setAttribute("SSOLoginVO", ssoLoginVO); UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter(); ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); @@ -335,11 +340,16 @@ public class APILoginContoller { loginVO.setIp(EgovClntInfo.getClntIP(request)); LoginVO resultVO = loginService.APIActionLogin(loginVO); + //23.10.19 - SSO세션 추가. actionLogin에서 SSO세션 오류로 인해 임시로 추가 + SsoLoginVO ssoLoginVO = new SsoLoginVO(); + ssoLoginVO.setOtherUser("Y"); + ssoLoginVO.setMembSeq("1"); if (loginService.getUserAuth(resultVO) != null) { resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority()); } resultVO.setUrl(returnUrl); request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성 + request.getSession().setAttribute("SSOLoginVO", ssoLoginVO); // SSOLogin세션 사용 유지 UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter(); ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); From e481ffd70b1193649d992ce708e6d07f2bac031a Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 20 Oct 2023 16:07:10 +0900 Subject: [PATCH 4/4] =?UTF-8?q?2023-10-20=2016:06=20=EA=B1=B0=EC=A3=BC?= =?UTF-8?q?=EC=A7=80=20=EC=84=A0=ED=83=9D=20=ED=8C=9D=EC=97=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml | 2 ++ src/main/webapp/WEB-INF/decorators.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml index 848dfa72..448c095e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml @@ -137,6 +137,7 @@ + /* VEInstrDetailDAO.insert */ + /* VEInstrDetailDAO.insertDup */ INSERT INTO ( diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 0535ab3d..17e9bb34 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -7,7 +7,7 @@ /uss/ion/fms/fmsfileUploadPopup.do /ve/**/*Popup* */kccadr/oprtn/tngrVisitEdu/instrDetailPopup.do - */sym/mnu/mcm/EgovMenuCreat.jsp + */sym/mnu/mcm/EgovMenuCreat.jsp */sym/cal/* @@ -43,6 +43,7 @@ */oprtn/cmm/SchduleManagerPopDetailAdult.jsp */oprtn/cmm/rejectPopup.jsp */oprtn/comm/popup/** + */ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do