diff --git a/src/main/java/kcc/com/cmm/util/DateUtil.java b/src/main/java/kcc/com/cmm/util/DateUtil.java index d8a50e9e..4ae69f21 100644 --- a/src/main/java/kcc/com/cmm/util/DateUtil.java +++ b/src/main/java/kcc/com/cmm/util/DateUtil.java @@ -212,4 +212,14 @@ public final class DateUtil { return strWeek; } + + public static int getNowyyyyMMddReturnInt() { + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyyMMdd"); + return Integer.parseInt(LocalDateTime.now().format(formatter2)); + } + public static LocalDate getStringToLocalDate(String p_date) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); + LocalDate date = LocalDate.parse(p_date, formatter); + return date; + } } diff --git a/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java b/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java index 1d383601..efdcf18b 100644 --- a/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java +++ b/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java @@ -241,6 +241,8 @@ public class BoardMaster implements Serializable { private String searchSortCnd = ""; // 정렬 항목 private String searchSortOrd = ""; // 정렬 구분(오름/내림) + + private String secretYn = ""; // 비밀글 여부 - 게시글 상세 조회 시 본인 글인지 체크 ex)ZOOM 게시판 /** @@ -1226,5 +1228,14 @@ public class BoardMaster implements Serializable { public void setTabBbsId(String tabBbsId) { this.tabBbsId = tabBbsId; } + + public String getSecretYn() { + return secretYn; + } + + public void setSecretYn(String secretYn) { + this.secretYn = secretYn; + } + } \ No newline at end of file diff --git a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java index e54b2588..93bd0eb1 100644 --- a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java +++ b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java @@ -390,7 +390,14 @@ public class EgovLoginLogController { HttpServletRequest request, Model model, HttpSession session) throws Exception { + System.out.println("(String)commandMap.get(pageType)"); + System.out.println((String)commandMap.get("pageType")); + System.out.println(loginLog.getAdmotId()); + System.out.println(loginLog.getAdmotId()); + System.out.println(loginLog.getAdmotId()); + if("Modify".equals((String)commandMap.get("pageType"))){ //수정 + loginLog.setAdmotId(loginLog.getAdmotId().trim()); loginLog = loginLogService.selectLogMethod(loginLog); } model.addAttribute("loginLog", loginLog); diff --git a/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java b/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java index 3e12b984..6e7c8229 100644 --- a/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java +++ b/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java @@ -285,12 +285,20 @@ public class EgovSysLogAspect { SysLog sysLog = new SysLog(); String className = joinPoint.getTarget().getClass().getName(); + String className3 = joinPoint.getSignature().getDeclaringType().getSimpleName(); + String className2 = joinPoint.getTarget().getClass().getSimpleName(); String methodName = joinPoint.getSignature().getName(); + String className4 = joinPoint.getTarget().getClass().getCanonicalName(); String processSeCode = "C"; String processTime = Long.toString(stopWatch.getTotalTimeMillis()); String uniqId = ""; String ip = ""; + System.out.println("className"); + System.out.println(className); + System.out.println(className2); + System.out.println(className3); + /* Authenticated */ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); if(isAuthenticated.booleanValue()) { @@ -300,6 +308,7 @@ public class EgovSysLogAspect { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); ip = request.getRemoteAddr(); sysLog.setUrl(request.getRequestURI()); + sysLog.setErrorCodeNm(request.getRequestURL().toString()); } sysLog.setSrvcNm(className); @@ -308,6 +317,8 @@ public class EgovSysLogAspect { sysLog.setProcessTime(processTime); sysLog.setRqesterId(uniqId); sysLog.setRqesterIp(ip); + sysLog.setTrgetMenuNm(className3); + //sysLog.setErrorCodeNm(className4); //sysLogService.logInsertSysLog(sysLog); sysLogService.logInsertAdminSysLog(sysLog); diff --git a/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java b/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java index 1719a4c6..a914db5c 100644 --- a/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java +++ b/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java @@ -114,8 +114,28 @@ public class EgovSysLogServiceImpl extends EgovAbstractServiceImpl implements System.out.println("=====i====="); System.out.println(i); System.out.println(i); + + String[] s_arr = sysLog.getSrvcNm().split("[.]"); + sysLog.setTrgetMenuNm(s_arr[s_arr.length-1]); + + System.out.println("=====i====="+sysLog.getTrgetMenuNm()); + System.out.println("=====i====="+sysLog.getSrvcNm()); try { + //저장이 안되었으면 LETTNADMINMETHOD 테이블에 추가하고 다시 저장해보기 + if (i<=0) { + //LETTNADMINMETHOD 테이블에 추가하기 + i = sysLogDAO.logInsertAdminSysLogNewStep3(sysLog); + + //다시 로그 남기기 + i = sysLogDAO.logInsertAdminSysLogNewStep1(sysLog); + } + + System.out.println("====re=i====="); + System.out.println(i); + System.out.println(i); + + //그래도 저장이 안되었으면 길이잘라서 log만 저장하기 if (i<=0) { if (sysLog.getUrl().length()>1000) sysLog.setUrl(sysLog.getUrl().substring(0,1000)); diff --git a/src/main/java/kcc/let/sym/log/lgm/service/impl/SysLogDAO.java b/src/main/java/kcc/let/sym/log/lgm/service/impl/SysLogDAO.java index 5df7dacd..a8e044ec 100644 --- a/src/main/java/kcc/let/sym/log/lgm/service/impl/SysLogDAO.java +++ b/src/main/java/kcc/let/sym/log/lgm/service/impl/SysLogDAO.java @@ -105,5 +105,10 @@ public class SysLogDAO extends EgovAbstractDAO { return update("SysLogDAO.logInsertAdminSysLogNewStep2", sysLog); } + + public int logInsertAdminSysLogNewStep3(SysLog sysLog) throws Exception{ + return update("SysLogDAO.logInsertAdminSysLogNewStep3", sysLog); + + } } 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 7db2f3b1..86482bb4 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -698,7 +698,19 @@ public class EgovLoginController { //ssologinVO.setMembSeq(loginVO.getId()); //중요 ssologinVO.setMembId(loginVO.getEmail()); - ssologinVO.setMembName(loginVO.getName()); + + // ================== 이름 암호화로 나오는 문제 해결 ==================== + ssologinVO.setMembName(egovCryptoUtil.decrypt(loginVO.getName())); + + System.out.println("==================임시=================="); + // ==== 계속 암호화에 암호화가 되서 임시로 넣음 + ssologinVO.setMembName(egovCryptoUtil.decrypt(ssologinVO.getMembName())); + ssologinVO.setMembName(egovCryptoUtil.decrypt(ssologinVO.getMembName())); + ssologinVO.setMembName(egovCryptoUtil.decrypt(ssologinVO.getMembName())); + ssologinVO.setMembName(egovCryptoUtil.decrypt(ssologinVO.getMembName())); + ssologinVO.setMembName(egovCryptoUtil.decrypt(ssologinVO.getMembName())); + + ssologinVO.setSexCode("M"); ssologinVO.setMembEmail(loginVO.getEmail()); ssologinVO.setMembCelnum(loginVO.getMembCelnum()); @@ -758,6 +770,7 @@ public class EgovLoginController { UserManageVO tmpUserManageVO = new UserManageVO(); tmpUserManageVO.setMberSeq(ssologinVO.getMembSeq()); tmpUserManageVO.setEmplyrNm(ssologinVO.getMembName()); + tmpUserManageVO = egovCryptoUtil.encryptUserManageVO(tmpUserManageVO); userManageService.updateUserNm(tmpUserManageVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java index 50dbcaf6..700a5624 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java @@ -13,6 +13,8 @@ public interface VEAcmdtAplctService { //R : VEInstrFeeAcmdtVO selectDetailByUser(VEInstrFeeAcmdtVO paramVO) throws Exception; + VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception; + VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java index d8206590..e4f0daae 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java @@ -27,6 +27,8 @@ public interface VEAsgnmMIXService { //배정 강사 확정 리스트 List selectAsgnmPagingList(VEInstrAsgnmVO paramVO) throws Exception; + VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO vEInstrAsgnmVO) throws Exception; + //R VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception; @@ -117,4 +119,5 @@ public interface VEAsgnmMIXService { //배정 최대값 제한 산술식을 위한 해당 교육 차시에 속한 달의 강사 교육접수차시 가져오기 //R VEInstrAsgnmVO selectTtlMntChasiSumDetail(VEInstrAsgnmVO paramVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java index a502a0dc..84faf663 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java @@ -39,6 +39,10 @@ public class VEAcmdtAplctDAO extends EgovAbstractDAO { return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser", paramVO); } + public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception { + return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r2", paramVO); + } + public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception { return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDcmdtAplctYesterday", paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java index 4c97c298..f96a16e5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java @@ -37,6 +37,11 @@ public class VEAcmdtAplctServiceImpl implements VEAcmdtAplctService { return vEAcmdtAplctDAO.selectDetailByUser(paramVO); } + //R + public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception { + return vEAcmdtAplctDAO.selectDetailByUser_r2(paramVO); + } + @Override public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception { return vEAcmdtAplctDAO.selectDcmdtAplctYesterday(paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java index a0892474..999a680c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java @@ -58,6 +58,11 @@ public class VEAsgnmMIXDAO extends EgovAbstractDAO { return tlist; } + public VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO paramVO) throws Exception { + VEInstrAsgnmVO tlist = (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.findByAcmdtCnfrm", paramVO); + return tlist; + } + public VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception { return (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.selectAsgnmRqstDetail", paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java index 1617b1ac..a326080a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java @@ -49,6 +49,10 @@ public class VEAsgnmMIXServiceImpl implements VEAsgnmMIXService { return vEAsgnmMIXDAO.selectAsgnmPagingList(paramVO); } + public VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO paramVO) throws Exception{ + return vEAsgnmMIXDAO.findByAcmdtCnfrm(paramVO); + } + //R public VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception { return vEAsgnmMIXDAO.selectAsgnmRqstDetail(paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index 988eee64..d2b425f2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -6,6 +6,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.dreamsecurity.magicline.util.Log; + import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; @@ -257,7 +260,28 @@ public class VEAsgnmController { List vEInstrAsgnmVOList = vEAsgnmMIXService.selectAsgnmPagingList(vEInstrAsgnmVO); - + vEInstrAsgnmVOList.stream().forEach(t-> { + try { + VEInstrAsgnmVO acmdtCnfrmVO = vEAsgnmMIXService.findByAcmdtCnfrm(t); + + + if(acmdtCnfrmVO != null) + { + if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn())) + t.setAcmdtSbmtYn(acmdtCnfrmVO.getAcmdtSbmtYn()); + if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn())) + t.setAcmdtAprvlCd(acmdtCnfrmVO.getAcmdtSbmtYn()); + if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn())) + t.setAcmdtFee(acmdtCnfrmVO.getAcmdtSbmtYn()); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + }); + + System.out.println("=========================================== "); //6.pageing step3 paginationInfo = this.setPagingStep3(vEInstrAsgnmVOList, paginationInfo); model.addAttribute("paginationInfo", paginationInfo); @@ -446,13 +470,26 @@ public class VEAsgnmController { //숙박 VEInstrFeeAcmdtVO acmdtAplct = new VEInstrFeeAcmdtVO(); acmdtAplct.setFrstRegisterId(loginVO.getUniqId()); - acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); - acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); + +// acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); +// acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); acmdtAplct.setInstrDiv("10"); - acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct); + acmdtAplct.setEduHopeDt(vEInstrAsgnmVOInfo.getEduHopeDt()); + + //=== 20230627 이호영 + //=== 숙박신청 차시 제거 + //=== 교육 key로만 select해서 진행 +// acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct); + acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct); + + + + + System.out.println("=========================================== "); String acmdtAplctCheck = "N"; - if(acmdtAplct.getAcmdtAplctOrd() != null) { +// if(StringUtils.isNotEmpty(acmdtAplct.getAcmdtAplctOrd())) { + if(acmdtAplct != null) { acmdtAplctCheck="Y"; } model.addAttribute("acmdtAplctCheck", acmdtAplctCheck); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java index 0d70dbf4..19f9e87e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailService.java @@ -34,6 +34,8 @@ public interface VEInstrDetailService { VEInstrDetailVO selectSlctnTeacher(VEInstrDetailVO vEInstrDetailVO) throws Exception; int updateInstrMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception; + + int updateInstrSigMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception; //EgovMap selectAdrRpplInfo(AdjstChangeDateVO adjstChangeDateVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index 8c7788f1..c057abb5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -157,7 +157,9 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String mngNmbrYr; - private String memo; + private String memo; // 비공개 메모 + + private String sigMemo; // 특이사항 메모 public String getLrnTmSum() { return lrnTmSum; @@ -795,4 +797,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setMngNmbrYr(String mngNmbrYr) { this.mngNmbrYr = mngNmbrYr; } + public String getSigMemo() { + return sigMemo; + } + public void setSigMemo(String sigMemo) { + this.sigMemo = sigMemo; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java index e7e70473..c2a79f89 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailDAO.java @@ -81,10 +81,14 @@ public class VEInstrDetailDAO extends EgovAbstractDAO { public VEInstrDetailVO selectSlctnTeacher(VEInstrDetailVO vEInstrDetailVO) throws Exception { return (VEInstrDetailVO) select("VEInstrDetailDAO.selectSlctnTeacher", vEInstrDetailVO); } - + public int updateInstrMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception { return update("VEInstrDetailDAO.updateInstrMemo", vEInstrDetailVO); } + + public int updateInstrSigMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return update("VEInstrDetailDAO.updateInstrSigMemo", vEInstrDetailVO); + } /** diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java index cf35f3f7..96f9390e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrDetailServiceImpl.java @@ -85,6 +85,11 @@ public class VEInstrDetailServiceImpl implements VEInstrDetailService { return vEInstrDetailDAO.updateInstrMemo(vEInstrDetailVO); } + + public int updateInstrSigMemo(VEInstrDetailVO vEInstrDetailVO) throws Exception { + return vEInstrDetailDAO.updateInstrSigMemo(vEInstrDetailVO); + + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java index e14a5daa..7df508fd 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrDetailVO.java @@ -22,6 +22,10 @@ public class VELctrDetailVO extends ComDefaultVO implements Serializable { private String userNm; //사용자 이름 private String lctrStngOrd; //강의설정순번 + private String lctrStngOrdTtl; // 참여현황 - 총계 + private String lctrStngOrdSbmt; // 참여현황 - 참여 + + private String sunLctrYn; //일요일 강의 여부 private String monLctrYn; //월요일 강의 여부 private String tueLctrYn; //화요일 강의 여부 @@ -120,6 +124,13 @@ public class VELctrDetailVO extends ComDefaultVO implements Serializable { //ve_lctr_rsrch_mng private String rsrchInstrDiv; private String rsrchStrtDt; + + // 조사 상태 + private String rsrchState; + + + + ; private String rsrchEndDt; private String stngYrMnt; //설정년월 @@ -355,6 +366,18 @@ public class VELctrDetailVO extends ComDefaultVO implements Serializable { public String getLctrStngOrd() { return lctrStngOrd; } + public String getLctrStngOrdTtl() { + return lctrStngOrdTtl; + } + public void setLctrStngOrdTtl(String lctrStngOrdTtl) { + this.lctrStngOrdTtl = lctrStngOrdTtl; + } + public String getLctrStngOrdSbmt() { + return lctrStngOrdSbmt; + } + public void setLctrStngOrdSbmt(String lctrStngOrdSbmt) { + this.lctrStngOrdSbmt = lctrStngOrdSbmt; + } public void setLctrStngOrd(String lctrStngOrd) { this.lctrStngOrd = lctrStngOrd; } @@ -571,6 +594,12 @@ public class VELctrDetailVO extends ComDefaultVO implements Serializable { public String getRsrchStrtDt() { return rsrchStrtDt; } + public String getRsrchState() { + return rsrchState; + } + public void setRsrchState(String rsrchState) { + this.rsrchState = rsrchState; + } public void setRsrchStrtDt(String rsrchStrtDt) { this.rsrchStrtDt = rsrchStrtDt; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchMngService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchMngService.java index e5a10344..0b22dcdf 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchMngService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchMngService.java @@ -28,4 +28,8 @@ public interface VELctrRsrchMngService { //조사진행목록 List selectPagingListLctr(VELctrDetailVO paramVO) throws Exception; + // lctrStngOrd 값 가져오기 + // 강의조사 요청목록에 참여현황 데이터 정제를 위함 + List findByLctrStngOrd(String stngYrMnt) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngDAO.java index d08f408a..70fcd817 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngDAO.java @@ -74,4 +74,9 @@ public class VELctrRsrchMngDAO extends EgovAbstractDAO { List tlist = (List) list("VELctrRsrchMngDAO.selectPagingListLctr", paramVO); return tlist; } + + public List findByLctrStngOrd(String stngYrMnt) throws Exception { + List tlist = (List) list("VELctrRsrchMngDAO.findByLctrStngOrd", stngYrMnt); + return tlist; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngServiceImpl.java index e20b5c44..5f5263b8 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngServiceImpl.java @@ -57,4 +57,8 @@ public class VELctrRsrchMngServiceImpl implements VELctrRsrchMngService { public List selectPagingListLctr(VELctrDetailVO paramVO) throws Exception{ return vELctrRsrchMngDAO.selectPagingListLctr(paramVO); } + + public List findByLctrStngOrd(String stngYrMnt) throws Exception{ + return vELctrRsrchMngDAO.findByLctrStngOrd(stngYrMnt); + } } diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java index 2d5b0252..41a639c3 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java @@ -146,6 +146,14 @@ public class EduAplctMngAdultController { vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); + + System.out.println("orderByQuery getOrderByQuery :: "+ vEEduAplctVO.getOrderByQuery()); + + // OrderByQuery(교육희망일자) 값이 비여있으면 desc로 초기화 함 => hylee + if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) { + vEEduAplctVO.setOrderByQuery("desc"); + } + List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); //3.pageing step3 diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index 6631d890..b2e60d5c 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -126,7 +126,7 @@ public class OprtnStateMngController { * 운영현황 관리 목록 화면 */ @RequestMapping("oprtnStateMngList.do") - public String OprtnAplctAnncmMngList( + public String oprtnStateMngList( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model ) throws Exception { diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java index d7c8ac69..a6ebc1d9 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java @@ -2514,6 +2514,49 @@ public class OprtnInstrTngrPrflContoller { return modelAndView; } + /** + * 특이 사항 메모저장 + */ + @RequestMapping("/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrSigMemoUpdateAjax.do") + public ModelAndView instrSigMemoUpdateAjax( + @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + //LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + int successCnt = 0; + try { + + vEInstrDetailService.updateInstrSigMemo(vEInstrDetailVO); + + successCnt = successCnt+1; + + } catch (Exception ex) { + ex.printStackTrace(); + } + if (successCnt == 0) { + modelAndView.addObject("result", "fail"); + } else { + modelAndView.addObject("result", "success"); + } + + return modelAndView; + } + ///////////////////////////////////////////////////////////////////////////////////// // diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java index 7b8cea0b..77916b64 100644 --- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java @@ -1,11 +1,13 @@ package kcc.ve.oprtn.instr.tngrVisitEdu.lctrRsrch.web; +import java.time.LocalDate; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.ctc.wstx.util.DataUtil; + import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; @@ -22,6 +26,7 @@ import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.util.DateUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; @@ -204,6 +209,30 @@ public class OprtnLctrRsrchTngrContoller { //2. pageing step2 vELctrDetailVO = vEPagingUtil.setPagingStep2_VELctrDetailVO(vELctrDetailVO, paginationInfo); List selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingList(vELctrDetailVO); + + LocalDate nowDate = LocalDate.now(); + selectVELctrDetailVOList.stream().forEach(t->{ + try { + List lctrStngOrdList = vELctrRsrchMngService.findByLctrStngOrd(t.getStngYrMnt()); + // 참여현황 총 토탈 카운트 + t.setLctrStngOrdTtl(Integer.toString(lctrStngOrdList.size())); + // 참여현황 참여 카운트 + t.setLctrStngOrdSbmt(Long.toString(lctrStngOrdList.stream().filter(s -> StringUtils.isNotEmpty(s)).count())); + + LocalDate startDate = DateUtil.getStringToLocalDate(t.getRsrchStrtDt()); + LocalDate endDate = DateUtil.getStringToLocalDate(t.getRsrchEndDt()); + + // 진행중 체크 + // 공통 코드 추가 VE0034 01 : 진행전, 02 : 진행중, 03 : 마감 + if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");} + else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");} + else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");} + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + }); //3.pageing step3 @@ -313,8 +342,6 @@ public class OprtnLctrRsrchTngrContoller { //로그인 처리==================================== - System.out.println(vELctrDetailVO.getStngYrMnt()); - System.out.println(vELctrDetailVO.getRsrchInstrDiv()); //1.pageing step1 PaginationInfo paginationInfo = new PaginationInfo(); @@ -323,8 +350,28 @@ public class OprtnLctrRsrchTngrContoller { //2. pageing step2 vELctrDetailVO = vEPagingUtil.setPagingStep2_VELctrDetailVO(vELctrDetailVO, paginationInfo); + + System.out.println("vELctrDetailVO.getOrderByQuery() :: "+ vELctrDetailVO.getOrderByQuery()); + + // 공통으로 사용하는 setPagingStep2_VELctrDetailVO 메소드에서 + // vELctrDetailVO.getSearchSortCnd() 이 없으면 prcs_ord로 강제 입력하는데 + // prcs_ord값은 detail 쿼리에 없는 값이라 다시 초기화 함 + System.out.println(vELctrDetailVO.getSearchSortCnd()); + System.out.println(vELctrDetailVO.getSearchSortOrd()); + if("prcs_ord".equals(vELctrDetailVO.getSearchSortCnd())) { + vELctrDetailVO.setSearchSortCnd(""); + vELctrDetailVO.setSearchSortOrd(""); + } + + + + if(StringUtils.isNotEmpty(vELctrDetailVO.getSearchSortCnd())) { + vELctrDetailVO.setOrderByQuery(vELctrDetailVO.getSearchSortCnd()+" "+vELctrDetailVO.getSearchSortOrd()); + } + List selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingListLctr(vELctrDetailVO); + System.out.println("============"); //3.pageing step3 paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectVELctrDetailVOList, paginationInfo); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 1f6863c4..311787d1 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -166,6 +166,8 @@ public class EduAplctMngTngrController { vEEduAplctVO.setOrderByQuery(vEEduAplctVO.getSearchSortCnd() + " " +vEEduAplctVO.getSearchSortOrd()); } + System.out.println("vEEduAplctVO.getOrderByQuery() :: "+ vEEduAplctVO.getOrderByQuery()); + //2. pageing step2 vEEduAplctVO = this.setPagingStep2Sub(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); @@ -402,6 +404,7 @@ public class EduAplctMngTngrController { List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); model.addAttribute("chasiList", vEEduChasiVOList); + model.addAttribute("cryptoUtil",egovCryptoUtil); return "oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup"; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 1cd0d39c..1c33f4df 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -407,6 +407,42 @@ public class EduRsltMngTngrController { } + + /** + * 교육결과관리 상세 화면 + */ + @RequestMapping("popup/chasiStatusPopup.do") + public String chasiStatusPopup( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpSession session + , HttpServletRequest request + ) throws Exception { + // 설문조사 문항리스트 조회 + + QustnrRespondInfoVO qustnrRespondInfoVO = new QustnrRespondInfoVO(); + qustnrRespondInfoVO.setSiteId(VeConstants.LCTR_DIV_CD_10); + QustnrRespondInfoVO info = egovQustnrRespondInfoService.selectSiteIdQustnrTmplat(qustnrRespondInfoVO); + + Map commandMap =new HashMap(); + commandMap.put("qestnrTmplatId", "QTMPLA_0000000000001"); + commandMap.put("qestnrId",info.getQestnrId()); //문제 ID + model.addAttribute("Comtnqustnrqesitm", egovQustnrRespondInfoService.selectQustnrRespondInfoManageComtnqustnrqesitm(commandMap)); + System.out.println("================================= Comtnqustnrqesitm ================================="); + + // 설문조사 결과 조회 + qustnrRespondInfoVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + qustnrRespondInfoVO.setEduChasiOrd(vEEduAplctVO.getEduChasiOrd()); + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList(qustnrRespondInfoVO); + if(chasiSrvyList.size() > 0) { + model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + model.addAttribute("chasiSrvyList",chasiSrvyList); + } + System.out.println("=============================================chasiSrvyList============================================="); + + return "oprtn/tngrVisitEdu/popup/chasiStatusPopup"; + } /** * 교육결과관리 상세 화면 @@ -425,6 +461,7 @@ public class EduRsltMngTngrController { //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + model.addAttribute("vEEduAplctVO", vEEduAplctVO); //로그인 처리==================================== try{ String chasiOrd = vEEduAplctVO.getEduChasiOrd(); @@ -534,6 +571,7 @@ public class EduRsltMngTngrController { commandMap.put("qestnrTmplatId", "QTMPLA_0000000000001"); commandMap.put("qestnrId",info.getQestnrId()); //문제 ID model.addAttribute("Comtnqustnrqesitm", egovQustnrRespondInfoService.selectQustnrRespondInfoManageComtnqustnrqesitm(commandMap)); + System.out.println("================================= Comtnqustnrqesitm ================================="); // 설문조사 결과 조회 qustnrRespondInfoVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); @@ -544,6 +582,7 @@ public class EduRsltMngTngrController { model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); model.addAttribute("chasiSrvyList",chasiSrvyList); } + System.out.println("=============================================chasiSrvyList============================================="); /* System.out.println("------------------------"); diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 4400a9ab..5e0e155c 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -21,8 +21,8 @@ Globals.LocalIp = 127.0.0.1 # DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 Globals.DbType = mysql -Globals.UserName= kccadrUr -Globals.Password= kccadr!@#$ +Globals.UserName= visiteduUr +Globals.Password= visitedu!@#$ # mysql #Globals.DriverClassName=net.sf.log4jdbc.DriverSpy @@ -33,7 +33,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -Globals.Url=jdbc:cubrid:219.240.88.15:30000:kcc_adrs4:::?charset=utf8 +Globals.Url=jdbc:cubrid:192.168.0.125:30000:visit_edu:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index d6eed368..13be53e8 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -21,8 +21,8 @@ Globals.LocalIp = 127.0.0.1 # DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 Globals.DbType = mysql -Globals.UserName= KCCADRUR -Globals.Password= KCCADRUR!@#$ +Globals.UserName= EDUMANAGER +Globals.Password= edumanager#pwd # mysql #Globals.DriverClassName=net.sf.log4jdbc.DriverSpy @@ -35,7 +35,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\uac1c\ubc1c\uc11c\ubc84 #Globals.Url=jdbc:cubrid:219.240.88.15:30000:kcc_adrs4:::?charset=utf8 #\uc2e4\uc11c\ubc84 -Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adrs:::?charset=utf8 +Globals.Url=jdbc:cubrid:211.170.184.173:53000:db_ceis:::?charset=utf8 # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) diff --git a/src/main/resources/egovframework/spring/com/context-datasource.xml b/src/main/resources/egovframework/spring/com/context-datasource.xml index 64f6b9da..0bd360f4 100644 --- a/src/main/resources/egovframework/spring/com/context-datasource.xml +++ b/src/main/resources/egovframework/spring/com/context-datasource.xml @@ -6,7 +6,8 @@ - classpath:/egovframework/egovProps/globals.properties + + classpath:/egovframework/egovProps/globals_#{systemProperties['spring.profiles.active']}.properties diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml index a76e62c3..b852e38f 100644 --- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml @@ -79,6 +79,7 @@ + @@ -360,7 +361,7 @@ MENU_NO, - VIEWS_YN,SE_CMMN_CD_ID + VIEWS_YN,SE_CMMN_CD_ID, SECRET_YN ) VALUES ( #bbsId#, #bbsTyCode#, #bbsAttrbCode#, #bbsNm#, #bbsIntrcn#, @@ -375,7 +376,7 @@ '9620000', /**사전정보공표 */ - #viewsYn#,#seCmmnCdId# + #viewsYn#,#seCmmnCdId#,#secretYn# ) @@ -411,6 +412,7 @@ a.DELETE_AUTH , a.VIEWS_YN, a.BBS_DC, + a.SECRET_YN, '' as MENU_COURS, /*REPLACE(GETMENUCOURS(h.MENU_NO), '|', ' > ') as MENU_COURS,*/ /*get1DepthMenuNo(h.MENU_NO) as FIRST_DEPT_MENU_NO,*/ @@ -514,7 +516,8 @@ MENU_NO = '9620000', /**사전정보공표 */ - BBS_DC = #bbsDc# + BBS_DC = #bbsDc#, + SECRET_YN = #secretYn# WHERE BBS_ID = #bbsId# diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml index 9390f780..6381742c 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml @@ -195,6 +195,7 @@ + /* SysLogDAO.logInsertAdminSysLogNewStep1 */ INSERT INTO LETTNADMINLOG ( ADMINLOG_ID , CONECT_ID @@ -226,6 +227,7 @@ + /* SysLogDAO.logInsertAdminSysLogNewStep2 */ INSERT INTO LETTNADMINLOG ( ADMINLOG_ID , CONECT_ID @@ -245,6 +247,30 @@ 'APPRO_NM' , #url# - + + + + + /* SysLogDAO.logInsertAdminSysLogNewStep3 */ + INSERT INTO lettnadminmethod ( + admot_id, + method_nm, + param, + creat_dt, + menu_nm, + appro_nm, + privacy + ) + + SELECT + MAX(REPLACE(admot_id,'ADMOTID_','')*1)+1 + , #methodNm# + , 'N' + , NOW() + , #trgetMenuNm# + , #url# + , 'N' + FROM LETTNADMINMETHOD + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml index f423c0a2..13f68fab 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml @@ -209,8 +209,16 @@ LETTNMENUINFO A INNER JOIN LETTNMENUCREATDTLS B on A.MENU_NO = B.MENU_NO WHERE A.MENU_NO > 0 - AND B.AUTHOR_CODE = #authorCode# ]]> + + AND (B.AUTHOR_CODE = #authorCode# + OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' + OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + GROUP BY A.MENU_NO + + + AND B.AUTHOR_CODE = #authorCode# + ORDER BY A.UPPER_MENU_NO, A.MENU_ORDR, diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml index b4a90ca5..93ac28fd 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml @@ -97,7 +97,15 @@ /* 매뉴사용여부 조회 */ - AND B.AUTHOR_CODE = #authorCode# + + + AND (B.AUTHOR_CODE = #authorCode# + OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' + OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + + + AND B.AUTHOR_CODE = #authorCode# + LIMIT 1 diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml index 4223905b..273ca3bb 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml @@ -159,6 +159,24 @@ + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml index bfe91c2d..a6c2e8b2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml @@ -774,9 +774,6 @@ ORDER BY 1=1 - - , A.EDU_APLCT_ORD DESC - , $orderByQuery$ diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml index ed8c8a5f..d4cedb9a 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Cubrid.xml @@ -127,7 +127,8 @@ a.appt_dt AS apptDt, a.hchk_dt AS hchkDt, a.rmrks AS rmrks, - a.memo AS memo + a.memo AS memo, + a.sig_memo AS sigMemo @@ -550,4 +551,18 @@ INSTR_DIV = #instrDiv# + + + UPDATE + VE_INSTR_DETAIL + SET + SIG_MEMO = #sigMemo# + WHERE + USER_ID = #userId# + AND + INSTR_DETAIL_ORD = #instrDetailOrd# + AND + INSTR_DIV = #instrDiv# + + diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml index 869471b3..3d888bed 100644 --- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml @@ -345,7 +345,10 @@ ORDER BY 1=1 + + + , dddd.rsdne asc @@ -357,4 +360,65 @@ LIMIT #recordCountPerPage# OFFSET #firstIndex# + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp index eb4f5fd6..85c7b886 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp @@ -318,6 +318,16 @@ function fn_egov_inqire_BBSMngInqire() { + + 비공개 여부 + + + 사용 + 미사용 + + + + 게시판 사용여부 diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp index e06b7c0c..c6374fba 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp @@ -379,6 +379,17 @@ $( document ).ready(function() { + + 비공개 여부 + + + 사용 + 미사용 + + + + + 게시판 사용여부 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp index c0ec1a09..beff326a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp @@ -22,6 +22,12 @@ + + " /> + " /> + " /> " /> + + " /> + " /> + " /> + + " /> + " /> + + " /> + " />
@@ -622,6 +671,11 @@ function replyCalculation(){ +
+
+ +
+

비공개 메모

@@ -704,5 +758,10 @@ function replyCalculation(){
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp index 6890c144..0742f3f7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -289,6 +289,32 @@ }); } + function updateHiddenSigMemo(){ + $("#sigMemo").val($("#sigMemoCn").val()); + + var data1 = new FormData(document.getElementById("hiddenSigMemoForm")); + + $.ajax({ + type:"POST", + url:"${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrSigMemoUpdateAjax.do", + data:data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("저장 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + @@ -300,6 +326,13 @@
+
+ + + + +
+ " /> @@ -564,6 +597,31 @@ + + +
+

특이사항 메모

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

내용

+ 		+
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp index 2b3c9fa8..198c16e2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp @@ -30,6 +30,40 @@ --%> + + + 강사배치 팝업 + + + + + + + + +
+ + + + +
+
+
+

강의만족도 결과 등록

+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공
교육일차시구분대상배정강사인원설문완료 여부
2022-03-3014:10~15:35(85분)101-1반원영현55설문진행중
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력
+

참석자

+ 		+ + + +

응답율

+ 		-
+

응답자

+ 		+ + + +

무응답

+ 		-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항매우만족만족보통불만족매우불만족
+ 1) 본 교육운영에 대하여 전반적으로 만족하십니까? + + + + + + + + + + + + + + + + + + + +
+ 2) 본 교육 내용구성에 대해서는 어느 정도 만족 하십니까? + + + + + + + + + + + + + + + + + + + +
+ 3) 교육 시간은 적절했다고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 4) 본 교육을 받기 전 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 5) 본 교육을 받은 후, 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 6) 본 교육을 통해, 학교 수업 혹은 직무에 얼마나 도움이 될 것이라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 7) 강사가 교육 5분 전까지 도착했나요?(지각여부_교사 only) + + + + + + + + + + + + + + + + + + + +
+ 8) 본 교육과 관련하여 강사가 교육 5분 전까지 도착했습니까?(지각여부확인_교사만) + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+
+ + + + +
+
+
+
+
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp index 6c30bc89..ff0129c3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp @@ -37,22 +37,15 @@ /* Page Url Hide */ @page { size: auto; /* auto is the initial value */ - margin: 0; /* this affects the margin in the printer settings */ + margin: 0; /* this affects the margin in the printer settings */ } @media print { - .cont_tit { - page-break-before: always; - } - - .page_break { - page-break-before: always; - height: 40px; - } - - .print_mark { - page-break-before: auto; - } + html, body {height:auto;margin: 0 !important;padding: 0 !important;overflow: hidden;page-break-after: avoid;} + .cont_tit {page-break-before: always;} + .page_break {page-break-inside:avoid; page-break-after:auto} + .print_mark {page-break-before: auto;} + form{display: none;} } @@ -155,7 +148,15 @@

교육장소

- + + +

+ checked disabled="disabled"> 집체교육 +

+

+ checked disabled="disabled"> 방송실교육 +

+ @@ -183,7 +184,7 @@ - + 신청취소 @@ -192,12 +193,24 @@ 교육신청 + + 대기 + - 교육확정 + 교육승인 교육반려 + + 교육확정 + + + 수정요청(대기) + + + 수정완료(대기) + - @@ -214,9 +227,9 @@ +

+
- -

교육차시 정보

@@ -235,6 +248,7 @@ 시간 구분 대상 + 배정강사 인원 @@ -264,6 +278,15 @@ + + + + - + + +
(${fn:split(list.userId,'_')[1]*1}) + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp index ad346c62..17f30219 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp @@ -1,5 +1,5 @@ <%-- - Class Name : EgovLoginLogList.jsp + Class Name : SelectLogMethodList.jsp Description : 로그인 로그 정보목록 화면 Modification Information @@ -124,7 +124,6 @@ function fnCheckAll(){ } -로그인 로그 목록 @@ -137,35 +136,88 @@ function fnCheckAll(){ -
-
-
-

관리자로그설정관리

-

관리자 로그 설정을 관리할 수 있습니다.

-
-
-
- - - -
-
-

건수 : 건

-
- - - + + + +
+
+ +
+

관리자로그설정관리

+
    +
    • +
  • +

    운영관리

    +
    • +
  • 관리자로그설정관리
    • +
-
-
+ + +
+ +
+
+
+

조회조건

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

총 건수 : 건

+
+ + +
+
+ + + + +
+ + @@ -188,7 +240,7 @@ function fnCheckAll(){ - + @@ -221,28 +273,47 @@ function fnCheckAll(){
파라미터 개인정보여부 등록일자 게시판관리관리
-
-
- - -
- - -
+ + + +
+ + + + + +
+
+ +
+
+ +
+
+ + + + +
    - -
-
- - + + +
+ + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp index 21cc2937..e1adcacc 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp @@ -149,11 +149,10 @@ function webLogListExcelDownload(){ document.frm.submit(); } -로그인 로그 목록 -
+ " /> " /> @@ -162,56 +161,86 @@ function webLogListExcelDownload(){ " /> -
-
-
-

사용자메뉴별접속통계

-

사용자메뉴별접속통계 파악할 수 있습니다.

-
-
-
- - - - - - -
- -
-

리스트 수 : 건

- - - - " readonly > - - - -   ~   - " readonly > - - - - - -
- - - <%-- --%> + + +
+
+ +
+

사용자매뉴별접속통계

+
    +
    • +
  • +

    운영관리

    +
    • +
  • 사용자매뉴별접속통계
    • +
-
-
+ + +
+ +
+
+
+

조회조건

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

접속일자

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

총 건수 : 건

+
+ + +
+
+ + + + +
+ + @@ -266,28 +295,48 @@ function webLogListExcelDownload(){
-
-
- -
- -
+ + + +
+ + + + + + -
    - -
- + +
+
    + +
+
+ +
-
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp index 137c8f02..00f0ae83 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp @@ -1,42 +1,133 @@ <%-- - Class Name : FmsFileModify.jsp - Description : 첨부파일 수정 페이지 + Class Name : SelectLogMethodList.jsp + Description : 로그인 로그 정보목록 화면 Modification Information - + 수정일 수정자 수정내용 ------- -------- --------------------------- - 2009.09.16 장동한 최초 생성 - - author : 공통서비스 개발팀 장동한 - since : 2009.09.16 - - Copyright (C) 2009 by MOPAS All right reserved. + 2009.03.11 이삼섭 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 이삼섭 + since : 2009.03.11 --%> -<%@ page contentType="text/html; charset=utf-8"%> +<%@ 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 prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - - + -팝업창관리 관리 - - - + - +
-
-
-
-

관리자로그설정관리

-

관리자 로그 설정을 관리 합니다.

-
-
-
-

*는 필수입력 항목입니다.

-
- + + + + +
+
+ +
+

관리자로그설정관리상세

+
    +
    • +
  • +

    운영관리

    +
    • +
  • 관리자로그설정관리
    • +
  • 상세화면
    • +
+
+ + +
+ + + + + +
+ + +
@@ -138,6 +246,12 @@ function fn_delete() { + + + + - + @@ -173,8 +289,47 @@ function fn_delete() { - + + + + + + + + + +
+
+ +
+
+ +
+
+ + + + +
+
    + +
+
+ + + + + + + - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 8057de1d..6666ab8c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -96,6 +96,7 @@ } ,dataType:'json' ,success:function(returnData){ + console.log(returnData); var info = returnData.chasiInfo; var tm = info.strtTm.replace(/(.{2})/,"$1:") +"~"+ info.endTm.replace(/(.{2})/,"$1:")+"("+info.lrnTm+"분)" $("#popupEduHopeDt").text(info.eduHopeDt); diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 177c62d5..c17fefbb 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -116,7 +116,7 @@ 600 - /offedu + /offeduadvc diff --git a/src/main/webapp/images/sortDown.png b/src/main/webapp/images/sortDown.png new file mode 100644 index 00000000..113eabba Binary files /dev/null and b/src/main/webapp/images/sortDown.png differ diff --git a/src/main/webapp/images/sortUp.png b/src/main/webapp/images/sortUp.png new file mode 100644 index 00000000..42721534 Binary files /dev/null and b/src/main/webapp/images/sortUp.png differ
기능명 + +
파라미터 @@ -147,9 +261,11 @@ function fn_delete() {
기능명privacy - + +
*기본값은 N 입니다. +
N / Y *개인정보 포함 여부를 표시합니다.