Merge branch 'JIWOO' into advc
This commit is contained in:
jiwoo
commit
296d9b3450
@ -389,6 +389,9 @@ public class EgovLoginController {
|
||||
* @return String
|
||||
* @exception Exception
|
||||
*/
|
||||
|
||||
/*231031.개발서버 selectbox 로그인용 임시
|
||||
메소드 삭제*/
|
||||
@RequestMapping(value = "/web/user/login/ssoDevLogin.do")
|
||||
public String ssoDevLogin(HttpServletRequest request, HttpServletResponse response, ModelMap model, @RequestParam Map<String, Object> commandMap, HttpSession session) throws Exception {
|
||||
|
||||
@ -774,6 +777,8 @@ public class EgovLoginController {
|
||||
|
||||
SsoLoginVO ssologinVO = new SsoLoginVO();
|
||||
|
||||
/*231031.개발서버 selectbox 로그인용 임시
|
||||
isDev 삭제 처리*/
|
||||
if ((ProfileUtil.isLocal() || ProfileUtil.isTLocal() || ProfileUtil.isDev()) && "Y".equals(loginVO.getIsSelect())) { //비 sso login
|
||||
|
||||
loginVO.setPassword("1");
|
||||
@ -953,35 +958,20 @@ public class EgovLoginController {
|
||||
System.out.println("==13==");
|
||||
// LoginVO세션에 사용자 정보 넣기
|
||||
resultVO.setMembSeq(ssologinVO.getMembSeq());
|
||||
System.out.println("==131==");
|
||||
resultVO.setMembId(ssologinVO.getMembId());
|
||||
System.out.println("==132==");
|
||||
resultVO.setMembName(ssologinVO.getMembName());
|
||||
System.out.println("==133==");
|
||||
resultVO.setMembSeq(ssologinVO.getMembSeq());
|
||||
System.out.println("==134==");
|
||||
resultVO.setMembCi(ssologinVO.getMembCi());
|
||||
System.out.println("==135==");
|
||||
resultVO.setMembEmail(ssologinVO.getMembEmail());
|
||||
System.out.println("==136==");
|
||||
resultVO.setMembCelnum(ssologinVO.getMembCelnum());
|
||||
System.out.println("==137==");
|
||||
resultVO.setMembBirth(ssologinVO.getMembBirth());
|
||||
System.out.println("==138==");
|
||||
resultVO.setMembSmsRecpYn(ssologinVO.getMembSmsRecpYn());
|
||||
System.out.println("==139==");
|
||||
resultVO.setMembEmailRecpYn(ssologinVO.getMembEmailRecpYn());
|
||||
System.out.println("==1311==");
|
||||
resultVO.setSexCode(ssologinVO.getSexCode());
|
||||
System.out.println("==1312==");
|
||||
resultVO.setDispsettMembDivisCode(ssologinVO.getDispsettMembDivisCode());
|
||||
System.out.println("==1313==");
|
||||
resultVO.setCorpnum(ssologinVO.getCorpnum());
|
||||
System.out.println("==1314==");
|
||||
resultVO.setBuisnRegnum(ssologinVO.getBuisnRegnum());
|
||||
System.out.println("==1315==");
|
||||
resultVO.setCompTitle(ssologinVO.getCompTitle());
|
||||
System.out.println("==1316==");
|
||||
|
||||
// 2. spring security 연동
|
||||
request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성
|
||||
|
||||
@ -950,6 +950,15 @@ public class EduAplctTngrController {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 교육신청 등록 화면
|
||||
*/
|
||||
@RequestMapping("eduInfo.do")
|
||||
public String eduInfo( @ModelAttribute("modelVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model , HttpServletRequest request ) throws Exception {
|
||||
|
||||
return "/web/ve/aplct/tngrVisitEdu/eduAplct/eduInfo";
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
//
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
#cntFileFolder#,
|
||||
#cntCn#,
|
||||
#registerId#,
|
||||
now(),
|
||||
SYSDATE,
|
||||
'Y',
|
||||
(SELECT MENU_NO FROM CNT_MANAGE A
|
||||
WHERE A.CNT_ID = #cntId#
|
||||
@ -132,7 +132,7 @@
|
||||
A.CNTDT_ID cntDtId,
|
||||
A.CNT_NAME cntName,
|
||||
B.EMPLYR_ID registerId,
|
||||
DATE_FORMAT(A.REGIST_PNTTM , '%Y-%m-%d %T') registPnttm
|
||||
TO_CHAR(A.REGIST_PNTTM, 'YYYY-MM-DD HH24:MI:SS') AS registPnttm
|
||||
FROM CNT_MANAGE A INNER JOIN LETTNEMPLYRINFO B
|
||||
ON A.REGISTER_ID = B.ESNTL_ID
|
||||
WHERE 1=1
|
||||
|
||||
1
src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000002.jsp
Normal file
1
src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000002.jsp
Normal file
@ -0,0 +1 @@
|
||||
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>교육소개 임시 페이지입니다.
|
||||
@ -203,6 +203,8 @@ function usrJoin(){
|
||||
</c:if>
|
||||
<!-- dev -->
|
||||
<c:if test="${environment eq 'dev' }">
|
||||
<!-- 231031.개발서버 selectbox 로그인용 임시 -->
|
||||
<!-- 개발로그인 버튼 삭제 처리 -->
|
||||
<p class="login_info header_login_wrap"><a href="${pageContext.request.contextPath}/web/user/login/ssoDevLogin.do" class="header_login"><i></i>개발로그인</a></p>
|
||||
<p class="login_info header_login_wrap"><a href="http://223.255.205.7/user/member/loginForm.do?eduOff=Y" class="header_login"><i></i>로그인</a></p> <!-- e-배움터 개발서버 -->
|
||||
<p class="login_info"><a href="http://223.255.205.7/user/usrservice/selectUserSeView.do?eduOff=Y" class="header_join" title="새창열림"><i></i>회원가입</a></p> <!-- e-배움터 개발서버 -->
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
<%--
|
||||
|
||||
Class Name : eduAplctReg.jsp
|
||||
Description : 교육신청등록
|
||||
Modification Information
|
||||
|
||||
수정일 수정자 수정내용
|
||||
------- -------- ---------------------------
|
||||
2021.12.02 조용준 내용
|
||||
|
||||
author : 조용준
|
||||
since : 2021.12.02
|
||||
|
||||
--%>
|
||||
<%@ page contentType="text/html; charset=utf-8"%>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
|
||||
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
|
||||
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
|
||||
<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
|
||||
<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
|
||||
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<style>
|
||||
input:disabled {
|
||||
background-color: #f9f9f9 !important;
|
||||
}
|
||||
input:read-only {
|
||||
background-color: #f9f9f9 !important;
|
||||
}
|
||||
</style>
|
||||
<script type="text/javaScript" language="javascript">
|
||||
</script>
|
||||
<div class="mask2" onclick="timeLayerUtil()"></div>
|
||||
<div class="cont_wrap" id="sub">
|
||||
|
||||
<div class="cont_tit">
|
||||
<h2>교육소개</h2>
|
||||
</div>
|
||||
|
||||
<div class="tb_tit01">
|
||||
교육소개 임시 페이지입니다.
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in New Issue
Block a user