diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java index 20f3a061..6b581dec 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java @@ -68,6 +68,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { String strOrgnztNm = rs.getString("orgnzt_nm"); String strAuthority = rs.getString("authority"); String strMberSeq = rs.getString("mber_seq"); + String strJoinType = rs.getString("join_type"); HttpServletRequest request = ((ServletRequestAttributes) @@ -88,6 +89,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { loginVO.setOrgnztNm(strOrgnztNm); loginVO.setAuthority(strAuthority); loginVO.setMembSeq(strMberSeq); + loginVO.setJoinType(strJoinType); request.getSession().setAttribute("LoginVO", loginVO); // LoginVO세션 생성 diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index aa4b56e6..6637bf81 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -1849,11 +1849,18 @@ public class EgovLoginController { // 관리자 로그인 시 LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - System.out.println("===========actionMain===========2"); - System.out.println(loginService.getUserAuth(user).getAuthority()); - System.out.println(user.getAuthority()); - if ("ROLE_ADMIN".equals(loginService.getUserAuth(user).getAuthority())) { // 수퍼관리자 경우 + String authStr = user.getAuthority(); + if( + "0".equals(user.getJoinType()) + && ("ROLE_ADMIN".equals(authStr) + || "ROLE_VISIT".equals(authStr) + || "ROLE_ADR_JRSDC".equals(authStr) + || "ROLE_ADR_KIPO".equals(authStr) + || "ROLE_ADR_PREV".equals(authStr)) + ) { //관리자 계정 생성 후 비밀번호를 한번도 변경하지 않은경우 비밀번호 변경 페이지로 이동 + return "redirect:/uss/umt/user/EgovUserSelectUpdtView4Self.do"; + } else if ("ROLE_ADMIN".equals(loginService.getUserAuth(user).getAuthority())) { // 수퍼관리자 경우 return "redirect:/cmm/main/mainPage.do"; } else if ("ROLE_USER_MANAGER".equals(user.getAuthority())) { return "redirect:/web/main/mainPage.do"; diff --git a/src/main/java/kcc/let/uss/umt/service/UserManageVO.java b/src/main/java/kcc/let/uss/umt/service/UserManageVO.java index f0c83250..3229a4b7 100644 --- a/src/main/java/kcc/let/uss/umt/service/UserManageVO.java +++ b/src/main/java/kcc/let/uss/umt/service/UserManageVO.java @@ -180,6 +180,8 @@ public class UserManageVO extends UserDefaultVO{ private String mberCi; + private String joinType; + public String getAuthorCode() { return authorCode; } @@ -723,6 +725,13 @@ public class UserManageVO extends UserDefaultVO{ public void setMberCi(String mberCi) { this.mberCi = mberCi; } + public String getJoinType() { + return joinType; + } + public void setJoinType(String joinType) { + this.joinType = joinType; + } + diff --git a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 18fc3904..1fba2d71 100644 --- a/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -131,6 +131,8 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement //pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); pass = EgovNewPasswordUtil.hashPassword(userManageVO.getPassword()); userManageVO.setPassword(pass); + //사용자가 비밀번호 변경해야함 + userManageVO.setJoinType("0"); }else { //관리자 이외 userManageVO.setPassword(pass); diff --git a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java index b7d951f9..d486e5b1 100644 --- a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java @@ -57,6 +57,7 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.util.EgovDoubleSubmitHelper; import kcc.com.cmm.util.RedirectUrlMaker; +import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.let.org.service.LocVO; import kcc.let.org.service.OrgChartManageService; @@ -2482,6 +2483,14 @@ public class EgovUserManageController { p_model.addAttribute("userOneDepth", userOneDepth); p_model.addAttribute("userTwoDepth", userTwoDepth); p_model.addAttribute("orgHiddenList", orgHiddenList); + + // 계정 생성 후 비밀번호를 한번도 변경하지 않았으면 관련 메시지 노출 + if( + StringUtil.isNotEmpty(p_loginVO.getJoinType()) + && "0".equals(p_loginVO.getJoinType()) + ){ + p_model.addAttribute("message", "계정 생성 후 비밀번호를 변경하지 않았습니다. \\n비밀번호를 변경 해주시기 바랍니다."); + } }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java index 4735c841..63eba404 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java @@ -561,7 +561,14 @@ public class CmdTrgtController { try { if (vEEduAplctVO !=null) { vEPrcsAplctVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); - vEPrcsAplctVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + + //나의 강의실, 신청목록에서 접근 시 해당 교육 정보 노출 + //교육 신청목록에서 접근 시 가장 최근 정보 노출 + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getEduAplctOrd())) { + vEPrcsAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); + }else { + vEPrcsAplctVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + } vEPrcsAplctVO = vEPrcsAplctPrdService.selectAplctInfo(vEPrcsAplctVO); } diff --git a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java index a39d2f25..bf49a0b2 100644 --- a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java +++ b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java @@ -560,7 +560,14 @@ public class PreventController { try { if (vEEduAplctVO !=null) { vEPrcsAplctVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); - vEPrcsAplctVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + + //나의 강의실, 신청목록에서 접근 시 해당 교육 정보 노출 + //교육 신청목록에서 접근 시 가장 최근 정보 노출 + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getEduAplctOrd())) { + vEPrcsAplctVO.setEduAplctOrd(vEPrcsDetailVO.getEduAplctOrd()); + }else { + vEPrcsAplctVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + } vEPrcsAplctVO = vEPrcsAplctPrdService.selectAplctInfo(vEPrcsAplctVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index abd474e1..f634f524 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -277,4 +277,10 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { public List selectExprnRsltFileDownList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectExprnRsltFileDownList(paramVO); } + + @Override + public void updateCnclStatus(VEEduAplctVO paramVO) { + vEEduMIXDAO.updateCnclStatus(paramVO); + + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java index 81b01a3e..7628fc6b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java @@ -275,11 +275,53 @@ public class VEInstrMixServiceImpl implements VEInstrMixService { return vEInstrMixDAO.selectEduPrfrmInfo_csi_no3(vEInstrDetailVO); } + public List selectEduPrfrmInfo_csi_no4(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_no4(vEInstrDetailVO); + } + public List selectEduPrfrmInfo_csi_no5(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrMixDAO.selectEduPrfrmInfo_csi_no5(vEInstrDetailVO); } + public List selectEduPrfrmInfo_csi_no6(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_no6(vEInstrDetailVO); + } + public List selectEduPrfrmInfo_csi_no7(VEInstrDetailVO vEInstrDetailVO) throws Exception{ return vEInstrMixDAO.selectEduPrfrmInfo_csi_no7(vEInstrDetailVO); } + + + public List selectEduPrfrmInfo_csi_prevent_no5(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_prevent_no5(vEInstrDetailVO); + } + + + public List selectEduPrfrmInfo_csi_cmdTrgt_no1(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no1(vEInstrDetailVO); + } + + public List selectEduPrfrmInfo_csi_cmdTrgt_no2(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no2(vEInstrDetailVO); + } + + public List selectEduPrfrmInfo_csi_cmdTrgt_no3(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no3(vEInstrDetailVO); + } + + public List selectEduPrfrmInfo_csi_cmdTrgt_no4(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no4(vEInstrDetailVO); + } + + public List selectEduPrfrmInfo_csi_cmdTrgt_no5(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no5(vEInstrDetailVO); + } + + public List selectEduPrfrmInfo_csi_cmdTrgt_no6(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no6(vEInstrDetailVO); + } + + public List selectEduPrfrmInfo_csi_cmdTrgt_no7(VEInstrDetailVO vEInstrDetailVO) throws Exception{ + return vEInstrMixDAO.selectEduPrfrmInfo_csi_cmdTrgt_no7(vEInstrDetailVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index fe037aec..ea014590 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -170,4 +170,8 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { return (List) list("VEPrcsAplctPrdDAO.selectTrgtList4_60", vEPrcsDetailVO); } + public List findByAprvlQustnrAllList(VEPrcsDetailVO vEPrcsDetailVO) { + return (List) list("VEPrcsAplctPrdDAO.findByAprvlQustnrAllList", vEPrcsDetailVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java index 170d2687..5dd004d6 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnInstrMngController.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Locale; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.poi.xssf.streaming.SXSSFWorkbook; @@ -32,6 +33,8 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailActvtHstryVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; @@ -69,6 +72,8 @@ public class CndtnInstrMngController { private static final Logger LOGGER = LoggerFactory.getLogger(CndtnInstrMngController.class); + private final String LCTR_DIV_CD = "60"; + //로그인 체크 util @Resource(name = "checkLoginUtil") private CheckLoginUtil checkLoginUtil; @@ -152,6 +157,10 @@ public class CndtnInstrMngController { @Resource(name = "vELctrMIXService") private VELctrMIXService vELctrMIXService; + // 첨부파일 정보 + @Resource(name="vEInstrDetailActvtHstryService") + private VEInstrDetailActvtHstryService vEInstrDetailActvtHstryService; + /* // 교육신청 서비스단 @@ -216,7 +225,7 @@ public class CndtnInstrMngController { vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); //기반강화 조회 - vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 //교육확정 목록 조회 vEPrcsDetailVO.setDdlnCd("20"); @@ -306,7 +315,7 @@ public class CndtnInstrMngController { vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); //기반강화 조회 - vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 //교육확정 목록 조회 vEPrcsDetailVO.setDdlnCd("20"); @@ -419,7 +428,7 @@ public class CndtnInstrMngController { vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); //기반강화 조회 - vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 //교육확정 목록 조회 vEPrcsDetailVO.setDdlnCd("20"); @@ -533,6 +542,7 @@ public class CndtnInstrMngController { //차시별 정보 VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth4Stts(vEPrcsDetailVO); model.addAttribute("vEPrcsDetailVOList", vEPrcsDetailVOList); @@ -585,7 +595,7 @@ public class CndtnInstrMngController { { vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); vEInstrDetailVODetail.setSearchEduStateCd("20"); //이수만 보기 - List selectAsgnmInfoT4List_no4 = vEInstrMixService.selectEduPrfrmInfo_csi_no1(vEInstrDetailVODetail); + List selectAsgnmInfoT4List_no4 = vEInstrMixService.selectEduPrfrmInfo_csi_no4(vEInstrDetailVODetail); model.addAttribute("list_no4",selectAsgnmInfoT4List_no4); } @@ -601,7 +611,7 @@ public class CndtnInstrMngController { { vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); vEInstrDetailVODetail.setSearchEduStateCd("20"); //이수만 보기 - List selectAsgnmInfoT6List = vEInstrMixService.selectEduPrfrmInfo_csi_no3(vEInstrDetailVODetail); + List selectAsgnmInfoT6List = vEInstrMixService.selectEduPrfrmInfo_csi_no6(vEInstrDetailVODetail); model.addAttribute("list_no6",selectAsgnmInfoT6List); } // ⑦월별 교육차시별 차시명, 이수, 미이수, 연기인원 통계 @@ -642,6 +652,59 @@ public class CndtnInstrMngController { } + /** + * @methodName : instrActvtHstrySignMngList + * @author : 이호영 + * @date : 2023.12.28 + * @description : 직인대장관리(이수증) - 기반 기소 + * @param vEInstrDetailActvtHstryVO + * @param model + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/instrActvtHstrySignAndCmpltCrtfcMngList.do") + public String instrActvtHstrySignAndCmpltCrtfcMngList( + @ModelAttribute("vEInstrActvtHstryVO") VEInstrDetailActvtHstryVO vEInstrDetailActvtHstryVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + //LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + +// if (loginVO == null || ssoLoginVO == null) { +// return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. +// } + //로그인 처리==================================== + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1_VEInstrDetailActvtHstryVO(vEInstrDetailActvtHstryVO); + //2. pageing step2 + vEInstrDetailActvtHstryVO = this.setPagingStep2_VEInstrDetailActvtHstryVO(vEInstrDetailActvtHstryVO, paginationInfo); + vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.encrypt(vEInstrDetailActvtHstryVO.getSearchKeyword())); +// List vEInstrDetailActvtHstryVOList = vEInstrDetailActvtHstryService.selectSignPagingList(vEInstrDetailActvtHstryVO); + List vEInstrDetailActvtHstryVOList = vEInstrDetailActvtHstryService.selectSignAndCmpltCrtfcPagingList(vEInstrDetailActvtHstryVO); + + vEInstrDetailActvtHstryVOList.stream().forEach(t-> t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); + + //3.pageing step3 + paginationInfo = this.setPagingStep3_VEInstrDetailActvtHstryVO(vEInstrDetailActvtHstryVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + // 검색어 복호화 + vEInstrDetailActvtHstryVO.setSearchKeyword(egovCryptoUtil.decrypt(vEInstrDetailActvtHstryVO.getSearchKeyword())); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEInstrDetailActvtHstryVOList); + + + +// return "oprtn/cmm/instrActvtHstrySignMngList"; + return "oprtn/cndtnSspnIdtmt/instrActvtHstrySignAndCmpltCrtfcMngList"; + } + /** * 교육실적통계 화면-개별 */ @@ -1022,7 +1085,7 @@ public class CndtnInstrMngController { //vEInstrDetailVODetail.setInstrNm(vEInstrDetailVODetail.getSearchKeyword()); vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); vEInstrDetailVODetail.setSearchEduStateCd("20"); //이수만 보기 - List selectAsgnmInfoT2List = vEInstrMixService.selectEduPrfrmInfo_csi_no1(vEInstrDetailVODetail); + List selectAsgnmInfoT2List = vEInstrMixService.selectEduPrfrmInfo_csi_no4(vEInstrDetailVODetail); //복호화 //selectAsgnmInfoT2List = egovCryptoUtil.decryptVELctrDetailVOList(selectAsgnmInfoT2List); @@ -1265,7 +1328,7 @@ public class CndtnInstrMngController { //vEInstrDetailVODetail.setInstrNm(vEInstrDetailVODetail.getSearchKeyword()); vEInstrDetailVODetail = egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVODetail); vEInstrDetailVODetail.setSearchEduStateCd("20"); //이수만 보기 - List selectAsgnmInfoT3List = vEInstrMixService.selectEduPrfrmInfo_csi_no3(vEInstrDetailVODetail); + List selectAsgnmInfoT3List = vEInstrMixService.selectEduPrfrmInfo_csi_no6(vEInstrDetailVODetail); //복호화 //selectAsgnmInfoT2List = egovCryptoUtil.decryptVELctrDetailVOList(selectAsgnmInfoT2List); @@ -1376,7 +1439,52 @@ public class CndtnInstrMngController { return p_paginationInfo; } + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep1_VEInstrDetailActvtHstryVO( + VEInstrDetailActvtHstryVO p_vEEduAplctVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit()); + paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize()); + + return paginationInfo; + } + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEInstrDetailActvtHstryVO setPagingStep2_VEInstrDetailActvtHstryVO( + VEInstrDetailActvtHstryVO p_vEEduAplctVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEEduAplctVO.setSearchSortCnd("prcs_ord"); + p_vEEduAplctVO.setSearchSortOrd("desc"); + } + + return p_vEEduAplctVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3_VEInstrDetailActvtHstryVO( + List p_vEEduAplctVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 1dbc34e7..81be5265 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -448,7 +448,7 @@ public class MainController { BoardVO boardVO = new BoardVO(); boardVO.setRecordCountPerPage(5); //게시글 수 boardVO.setFirstIndex(0); // - boardVO.setBbsId("BBSMSTR_000000000653"); + boardVO.setBbsId("BBSMSTR_000000000010"); List vo = bbsMngService.selectMainBoardRecent(boardVO); //게시글 내용 html 태그 삭제 for(int i=0; i commandMap, - ModelMap model) + ModelMap model, MenuManageJTreeVO menuManageVO) throws Exception { try { SiteManagerVO siteManagerVO = new SiteManagerVO(); @@ -978,6 +978,31 @@ public class MainController { return "web/com/insp"; } model.addAttribute("siteManagerVO", siteManagerVO); + + + //로그인 권한 정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String auth = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getAuthority()); + //권한별 메뉴표시 + if(!auth.equals("ROLE_ADMIN") && auth != "") { + menuManageVO.setAuthorCode(auth); + }else if(auth.equals("ROLE_ADMIN")) { + menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); + } + else { + menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); + } + + MenuManageVO resultVO = new MenuManageVO(); + MenuManageVO tempMenuManageVO = new MenuManageVO(); + tempMenuManageVO.setSearchCondition("Y"); + setViewMenu(request , commandMap , tempMenuManageVO , resultVO , menuManageVO ); + List menuResultList = menuCreateManageService.selectMenuLeftListJtreeWeb(menuManageVO) ; + model.addAttribute("menuResultList", menuResultList); + String pageUrl = request.getRequestURI().replaceAll(request.getContextPath(), ""); + + String pageUri = pageUrl.substring(0, pageUrl.lastIndexOf("/")); + model.addAttribute("pageUri", pageUri); }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml index 20a0ffcc..e9a6b1c2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml @@ -848,6 +848,7 @@ AND b.sex = #sex# and c.edu_strt_pnttm >= TO_CHAR(NOW(),'YYYY.MM.DD') + AND a.aprvl_cd in ('10','20','60') diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Postgresql.xml new file mode 100644 index 00000000..b7acc430 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetailActvtHstry_SQL_Postgresql.xml @@ -0,0 +1,311 @@ + + + + + + + + + + + ve_instr_detail_actvt_hstry + + + + + instr_detail_actvt_hstry_ord + , user_id + , instr_detail_ord + , aplct_pnttm + , state_cd + , state_pnttm + , aplct_atch_file_id + , cmpnn_cn + , frst_regist_pnttm + , frst_register_id + , last_updt_pnttm + , last_updusr_id + + , docu_nmbr + , sex + , purpose + , bsns_nmbr + , bsns_nm + + + + + + a.instr_detail_actvt_hstry_ord as instrDetailActvtHstryOrd + , a.user_id as userId + , a.instr_detail_ord as instrDetailOrd + , TO_CHAR(a.aplct_pnttm,'YYYY-MM-DD') AS aplctPnttm + , a.state_cd as stateCd + , TO_CHAR(a.state_pnttm,'YYYY-MM-DD') AS statePnttm + , a.aplct_atch_file_id as aplctAtchFileId + , a.cmpnn_cn as cmpnnCn + , TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm + , a.frst_register_id as frstRegisterId + , TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS frstRegistPnttm + , a.last_updusr_id as lastUpdusrId + + , a.docu_nmbr AS docuNmbr + , a.sex + , a.purpose + , a.bsns_nmbr AS bsnsNmbr + , a.bsns_nm AS bsnsNm + , a.actvt_period AS actvtPeriod + + + + /* VEInstrDetailActvtHstryDAO.insert */ + INSERT INTO ( + + )VALUES( + #instrDetailActvtHstryOrd# + , #userId# + , #instrDetailOrd# + , SYSDATE + , #stateCd# + , SYSDATE + , #aplctAtchFileId# + , #cmpnnCn# + , SYSDATE + , #frstRegisterId# + , '' + , #lastUpdusrId# + + , #docuNmbr# + , #sex# + , #purpose# + , #bsnsNmbr# + , #bsnsNm# + ) + + + + + + + + + + + + + UPDATE + + SET + state_cd = #stateCd# + + + , docu_nmbr = NVL( + ( + SELECT nvl(max(docu_nmbr),0) AS docuNmbr + FROM ve_instr_detail_actvt_hstry a + WHERE state_cd='30' + AND to_char(a.state_pnttm,'YYYY')=( + SELECT to_char(sysdate,'YYYY') + FROM dual + ) + GROUP BY to_char(a.state_pnttm,'YYYY') + ),0 + )+1 + + + + , cmpnn_cn = #cmpnnCn# + + , state_pnttm = SYSDATE + , LAST_UPDT_PNTTM = SYSDATE + , LAST_UPDUSR_ID = #lastUpdusrId# + WHERE + instr_detail_actvt_hstry_ord = #instrDetailActvtHstryOrd# + + + + + + UPDATE + + SET + actvt_period = #actvtPeriod# + WHERE + instr_detail_actvt_hstry_ord = #instrDetailActvtHstryOrd# + + + + + + 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 5714f718..efbfadb9 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 @@ -632,12 +632,11 @@ - AND a.lctr_div_cd=#lctrDivCd# + AND b.lctr_div_cd=#lctrDivCd# - - AND COALESCE(a.use_yn,'Y')='Y' - + + AND COALESCE(a.use_yn,'Y')!='D' ORDER BY 1, b.prcs_nm ASC @@ -1702,6 +1701,241 @@ AND aprvl_cd='20' - + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml index c4ae2d1a..79f863bb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Postgresql.xml @@ -595,7 +595,6 @@ /* 신청 후 취소 */ , user_id = NULL , edu_aplct_ord = NULL - , edu_state_cd = '10' , prcs_aplct_prd_ord_cmplt = NULL @@ -603,7 +602,6 @@ /* 신청 후 반려 */ , user_id = NULL , edu_aplct_ord = NULL - , edu_state_cd = '10' , prcs_aplct_prd_ord_cmplt = NULL @@ -622,6 +620,7 @@ /* 취소 신청 승은(교육중단) edu_state_cd=60,req_state_cd=40 */ , edu_state_cd = '60' + , req_state_cd = '35' /* , req_state_cd = '40' 의뢰상태는 교육의 취소, 확정과 관계없이 대상자의 의뢰 상태를 변경 하는것 이므로 여기서는 제외한다. */ WHERE @@ -642,12 +641,18 @@ - + /* 신청 후 관리자 반려 aplct_state_cd=50 */ - , aplct_state_cd = '50' + , aplct_state_cd = '60' - + + + /* 취소 신청 후 관리자 반려 aplct_state_cd=null */ + , aplct_state_cd = null + + + WHERE edu_aplct_ord = #eduAplctOrd# diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp index 9d1528eb..6abd62a7 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp @@ -85,6 +85,10 @@ $( document ).ready(function(){ $('#userWork_case2').hide(); } */ + + + alert(""); + }); function setOrgDepth_01(){ diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp index 58a0886d..771349b7 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp @@ -174,11 +174,11 @@ function bbsMasterExcelDownload(){ - + <%-- checked='checked' > 미사용 - + --%> "> --%> +<%-- --%> + + + + + + + + + + + +<%-- "> --%> +<%-- --%> + + + + + + + +<%-- --%> +<%-- --%> + + + +<%-- --%> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항매우만족만족보통불만족매우불만족
+ ${status1.count}) + + + + + + + + + + +
+
+ + + + + +
+ + + + + + + + + + + + + + + + +
기타의견
기타의견
+
+ +
+
+
+ +
+
+
+ +
+ + + + + + + + + +<%-- --%> + + +
+
+ + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + +
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/instrActvtHstrySignAndCmpltCrtfcMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/instrActvtHstrySignAndCmpltCrtfcMngList.jsp new file mode 100644 index 00000000..554ad38c --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/instrActvtHstrySignAndCmpltCrtfcMngList.jsp @@ -0,0 +1,249 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +<% + /** + * @Class Name : instrActvtHstrySignMngList.jsp + * @Description : 운영관리 > 직인대장관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.12.7 안주영 최초 생성 + * @author 안주영 + * @since 2022.2.7 + * @version 1.0 + * @see + * + */ +%> + + + + + + 직인대장관리(이수증) + + +
+ +
+
+ + " /> + " /> + +
+
+ + +
+

직인대장관리(이수증) 목록

+
    +
    • +
  • +

    운영관리

    +
    • +
  • 직인대장관리(이수증)
    • +
+
+ + +
+ +
+ +
+
+

발급일자

+
+
+
+ +
+ ~ +
+ +
+ +
+
+
+
+

성명

+
+
+ + + +
+
+
+ + + +
+

총 건수 : 건

+
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + + +
번호항목문서번호과정명교육일시성명발급일자
+ + + + + 실무역량- + 기소유예- + + + + + + + + + +
+
+ + +
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/instrActvtHstrySignAndCmpltCrtfcMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/instrActvtHstrySignAndCmpltCrtfcMngList.jsp new file mode 100644 index 00000000..014e61db --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/instrActvtHstrySignAndCmpltCrtfcMngList.jsp @@ -0,0 +1,249 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +<% + /** + * @Class Name : instrActvtHstrySignMngList.jsp + * @Description : 운영관리 > 직인대장관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.12.7 안주영 최초 생성 + * @author 안주영 + * @since 2022.2.7 + * @version 1.0 + * @see + * + */ +%> + + + + + + 직인대장관리(이수증) + + +
+ +
+
+ + " /> + " /> + +
+
+ + +
+

직인대장관리(이수증) 목록

+
    +
    • +
  • +

    운영관리

    +
    • +
  • 직인대장관리(이수증)
    • +
+
+ + +
+ +
+ +
+
+

발급일자

+
+
+
+ +
+ ~ +
+ +
+ +
+
+
+
+

성명

+
+
+ + + +
+
+
+ + + +
+

총 건수 : 건

+
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + + +
번호항목문서번호과정명교육일시성명발급일자
+ + + + + 실무역량- + 기소유예- + + + + + + + + + +
+
+ + +
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp index 13db7c96..c4b1d1d6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/newEduPrfrmMngList.jsp @@ -1220,21 +1220,20 @@ -
+

⑦월별 교육차시별 차시명, 이수, 미이수, 연기인원 통계

-
- +
+ --> + 차시 이수인원 @@ -1260,18 +1258,6 @@ - 합계 @@ -1305,9 +1291,9 @@
+ --> - - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/newEduPrfrmMngList.jsp new file mode 100644 index 00000000..f754e7e8 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/newEduPrfrmMngList.jsp @@ -0,0 +1,1305 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% + /** + * @Class Name : newEduPrfrmMngList.jsp + * @Description : 교육신청관리 > 교육실적통계 (new 2024-01-10) + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + +교육확정관리 + + + + + " /> + " /> + + + +
+
+ +
+

교육실적통계

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 교육실적통계
    • +
+
+ + +
+ +
+
+
+

구분

+
+
+ + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +

+ ①월별 교육 이수 현황 +

+
+ + + +
+
+ + + + + + + + + + + +
+
+
+ +
+ + + +
+ + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분 + + 합계 + ${list.codeNm}월 + + +
이수(명)
횟수
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp index 41ce9b92..a3d41e13 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp @@ -563,8 +563,11 @@ 상태 - - + + + + - + @@ -608,8 +611,8 @@ - -<%-- --%> + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp index ac4fe5d0..c858b445 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduAplctPop.jsp @@ -12,7 +12,6 @@ 교육신청 목록 > 기소유예 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템 - + + " /> + " /> + " /> + " /> + + + + +
+
+

취소요청

+
+
+
+ + + + + + + + <%-- + + + --%> + + + + + +
첨부파일, 취소사유를 입력하는 표
+

첨부파일

+ 		+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 3개

+

50MB제한

+
+
+
+

필수입력 항목*

+

취소사유

+ 		+ +
+
+ +
+
첨부파일
+
+
+ + + + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 리스트 : 파일명, 종류, 크기
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+ +
+
+

최대 1개

+

50MB제한

+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index 9db0a0bf..3087f1af 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -563,8 +563,11 @@ 상태 - - + + + + - + @@ -608,8 +611,8 @@ - -<%-- --%> + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index 5056a519..1a5d6c9b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -24,9 +24,10 @@ } - function fncGoDetail(prcsAplctPrdOrd){ + function fncGoDetail(prcsAplctPrdOrd, eduAplctOrd){ var viewForm = document.viewForm ; viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; + viewForm.eduAplctOrd.value = eduAplctOrd ; //viewForm.action = ""; viewForm.action = ""; viewForm.submit(); @@ -188,6 +189,7 @@
+
@@ -235,7 +237,7 @@ - ');" onkeypress="if(event.keyCode == 13){fncGoDetail('');}" style="cursor:pointer;" tabindex="0"> + ', '');" onkeypress="if(event.keyCode == 13){fncGoDetail('', '');}" style="cursor:pointer;" tabindex="0"> @@ -254,7 +256,7 @@ - + - @@ -295,13 +297,12 @@ -<%-- --%> - - + + - + - + 대상설문없음 - + - - + + + + + + + + + 교육완료 + - @@ -364,7 +375,7 @@
  • 교육과정 - ');" > + ', '');" > @@ -392,7 +403,7 @@ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp index 13950005..290da886 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduCancelPop.jsp @@ -141,6 +141,7 @@ " /> " /> + " /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index dcbac825..89df39d3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -47,7 +47,7 @@ //강의계획서 컨트롤 생성 control1 = innorix.create({ el : '#lctrPlan', // 컨트롤 출력 객체 ID - installUrl: '', // Agent 설치 페이지 + /* installUrl: '', // Agent 설치 페이지 */ uploadUrl: '', // 업로드 URL maxFileCount : 1, // 첨부가능 파일 전체 개수 width : 870, // 컨트롤 출력 너비(pixel) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp index e6a1ebd4..7e027e7f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp @@ -47,7 +47,7 @@ //강의계획서 컨트롤 생성 control1 = innorix.create({ el : '#docAtch', // 컨트롤 출력 객체 ID - installUrl: '', // Agent 설치 페이지 + /* installUrl: '', // Agent 설치 페이지 */ uploadUrl: '', // 업로드 URL maxFileCount : 1, // 첨부가능 파일 전체 개수 width : 870, // 컨트롤 출력 너비(pixel) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp index c6de8c30..a7682998 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp @@ -69,7 +69,7 @@ control = innorix.create({ el: '#fileControl' // 컨트롤 출력 HTML 객체 ID , transferMode: 'both' // 업로드, 다운로드 혼합사용 - , installUrl: '' // Agent 설치 페이지 + /* , installUrl: '' // Agent 설치 페이지 */ , uploadUrl: '' // 업로드 URL , height:40 , width: 650