tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hylee' into advc

Browse Source
This commit is contained in:
hylee 2023-10-31 15:32:58 +09:00
commit 6d8aedc91f
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
View File

@ -128,11 +128,16 @@ public class CndtnTrgtMngController {
public String trgtList(
@ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO
, ModelMap model
, HttpServletRequest request
) throws Exception {
//로그인 처리====================================
//로그인 정보 가져오기
LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
System.out.println("loginVO.getAuthority() :: "+ loginVO.getAuthority());
String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model);
if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo;

5
src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Tibero.xml
View File

@ -90,12 +90,11 @@
<select id="authorManageDAO.selectAuthor" resultMap="author">
/* authorManageDAO.selectAuthor */
<![CDATA[
SELECT AUTHOR_CODE, AUTHOR_NM, AUTHOR_DC, AUTHOR_CREAT_DE,
DATE_FORMAT(AUTHOR_CREAT_DE , '%Y-%m-%d') SORT_NUM
AUTHOR_CREAT_DE AS SORT_NUM
/* DATE_FORMAT(AUTHOR_CREAT_DE , '%Y-%m-%d') SORT_NUM */
FROM LETTNAUTHORINFO
WHERE AUTHOR_CODE=#authorCode#
]]>
</select>
<select id="authorManageDAO.selectAuthorListTotCnt" parameterClass="AuthorManageVO" resultClass="int">

2
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -102,7 +102,7 @@
document.statusChgForm.eduStateCd.value = aplctStateCd ;
document.statusChgForm.sspnIdtmtTrgtOrd.value = sspnIdtmtTrgtOrd ;
var data = new FormData(document.getElementById("statusChgForm"));
if(confirm("상태병경을 하시겠습니까?")){
if(confirm("상태변경을 하시겠습니까?")){
var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdAjax.do'/>";
$.ajax({
type:"POST",

2
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp
View File

@ -94,7 +94,7 @@
document.statusChgForm.eduAplctOrd.value = eduAplctOrd ;
document.statusChgForm.aplctStateCd.value = aplctStateCd ;
var data = new FormData(document.getElementById("statusChgForm"));
if(confirm("상태병경을 하시겠습니까?")){
if(confirm("상태변경을 하시겠습니까?")){
var url = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/updateAplctStateCdAjax.do'/>";
$.ajax({
type:"POST",