Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into adv

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;
+	}
 }

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;
+	}
+	
 	
 }

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);	

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);

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));
 				

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);
+		
+	}
 
 }

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);
         }

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;
 	
 	

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java

@@ -27,6 +27,8 @@ public interface VEAsgnmMIXService {
 	//배정 강사 확정 리스트
 	List<VEInstrAsgnmVO> 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;
+
 }

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);
 	}

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);

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);
 	}

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);

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<VEInstrAsgnmVO> 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);

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;

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;
+	}
+	
 }

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);
+	}
 	
 	
 	/**

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);
+		
+	}
 
 
 

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;
 	}

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchMngService.java

@@ -28,4 +28,8 @@ public interface VELctrRsrchMngService {
 	//조사진행목록
 	List<VELctrDetailVO> selectPagingListLctr(VELctrDetailVO paramVO) throws Exception;
 	
+	// lctrStngOrd 값 가져오기
+	// 강의조사 요청목록에 참여현황 데이터 정제를 위함
+	List<String> findByLctrStngOrd(String stngYrMnt) throws Exception;
+	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngDAO.java

@@ -74,4 +74,9 @@ public class VELctrRsrchMngDAO extends EgovAbstractDAO {
 		List<VELctrDetailVO> tlist = (List<VELctrDetailVO>) list("VELctrRsrchMngDAO.selectPagingListLctr", paramVO);
 		return tlist;
 	}
+	
+	public List<String> findByLctrStngOrd(String stngYrMnt) throws Exception {
+		List<String> tlist = (List<String>) list("VELctrRsrchMngDAO.findByLctrStngOrd", stngYrMnt);
+		return tlist;
+	}
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchMngServiceImpl.java

@@ -57,4 +57,8 @@ public class VELctrRsrchMngServiceImpl implements VELctrRsrchMngService {
 	public List<VELctrDetailVO> selectPagingListLctr(VELctrDetailVO paramVO) throws Exception{
 		return vELctrRsrchMngDAO.selectPagingListLctr(paramVO);
 	}
+	
+	public List<String> findByLctrStngOrd(String stngYrMnt) throws Exception{
+		return vELctrRsrchMngDAO.findByLctrStngOrd(stngYrMnt);
+	}
 }

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<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO);
 		vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList);
     	//3.pageing step3

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 {

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;
+		}
+		
 		
 		/////////////////////////////////////////////////////////////////////////////////////
 		//

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<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingList(vELctrDetailVO);
+
+			LocalDate nowDate = LocalDate.now();
+			selectVELctrDetailVOList.stream().forEach(t->{
+				try {
+					List<String> 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<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingListLctr(vELctrDetailVO);
 			
+			System.out.println("============");
 			
 			//3.pageing step3
 			paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectVELctrDetailVOList, paginationInfo);

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<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
 		model.addAttribute("chasiList", vEEduChasiVOList);
 		
+		model.addAttribute("cryptoUtil",egovCryptoUtil);
 		return "oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup";		
 	}	
 	

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 <String, Object> commandMap =new HashMap<String, Object>();
+    	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<QustnrRespondInfoVO> 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("------------------------");

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.UserName= visiteduUr
-Globals.Password= kccadr!@#$
+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
 

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.UserName= EDUMANAGER
-Globals.Password= KCCADRUR!@#$
+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)

src/main/resources/egovframework/spring/com/context-datasource.xml

@@ -6,7 +6,8 @@
     <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations">
             <list>
-                <value>classpath:/egovframework/egovProps/globals.properties</value>
+<!--                 <value>classpath:/egovframework/egovProps/globals.properties</value> -->
+                <value>classpath:/egovframework/egovProps/globals_#{systemProperties['spring.profiles.active']}.properties</value>
             </list>
         </property>
     </bean>

src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml

@@ -79,6 +79,7 @@
 		<result property="writeYn" column="WRITE_YN"  nullValue="" />
 		<result property="menuNm" column="MENU_NM"  nullValue="" />
 		<result property="menuNo" column="MENU_NO"  nullValue="" />
+		<result property="secretYn" column="SECRET_YN"  nullValue="" />
 
 	</resultMap>
 
@@ -360,7 +361,7 @@
 			 <isEqual property="bbsTyCode" compareValue="BBST07">
 			 	MENU_NO,
 			 </isEqual>
-			 VIEWS_YN,SE_CMMN_CD_ID
+			 VIEWS_YN,SE_CMMN_CD_ID, SECRET_YN
 			  )
 			VALUES
 			( #bbsId#, #bbsTyCode#, #bbsAttrbCode#, #bbsNm#, #bbsIntrcn#,
@@ -375,7 +376,7 @@
 			  <isEqual property="bbsTyCode" compareValue="BBST07">
 			 	'9620000',  /**사전정보공표 */
 			 </isEqual>
-			  #viewsYn#,#seCmmnCdId#
+			  #viewsYn#,#seCmmnCdId#,#secretYn#
 			 )
 	</insert>
 
@@ -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 @@
 				<isEqual property="bbsTyCode" compareValue="BBST07">
 					MENU_NO = '9620000', /**사전정보공표 */
 				</isEqual>
-			 	BBS_DC = #bbsDc#
+			 	BBS_DC = #bbsDc#,
+			 	SECRET_YN = #secretYn#
 			WHERE BBS_ID = #bbsId#
  	</update>
 

src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml

@@ -195,6 +195,7 @@
 	
 		<!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록된 것만 insert)  -->
 	<update id="SysLogDAO.logInsertAdminSysLogNewStep1" parameterClass="sysLog">
+		/*	SysLogDAO.logInsertAdminSysLogNewStep1	*/
 		INSERT INTO LETTNADMINLOG 
 		 ( ADMINLOG_ID
 		  , CONECT_ID
@@ -226,6 +227,7 @@
 	
 		<!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록된 것만 insert)  -->
 	<update id="SysLogDAO.logInsertAdminSysLogNewStep2" parameterClass="sysLog">
+		/*	SysLogDAO.logInsertAdminSysLogNewStep2	*/
 		INSERT INTO LETTNADMINLOG 
 		 ( ADMINLOG_ID
 		  , CONECT_ID
@@ -245,6 +247,30 @@
 				'APPRO_NM' ,
 				#url#
 
-	</update>	
+	</update>
+	
+		<!-- 시스템 관리자 로그 등록(LETTNADMINMETHOD 테이블에 등록하기)  -->
+	<update id="SysLogDAO.logInsertAdminSysLogNewStep3" parameterClass="sysLog">
+		/*	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
+	</update>			
 </sqlMap>
 

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#
 		 ]]>
+		 <isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+		        AND (B.AUTHOR_CODE = #authorCode#
+		 		OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
+		 		OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
+		 		GROUP BY A.MENU_NO
+		 </isEqual>
+		 <isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+		        AND B.AUTHOR_CODE = #authorCode#
+		 </isNotEqual>
 		    ORDER BY
 		        A.UPPER_MENU_NO,
 		        A.MENU_ORDR,

src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml

@@ -97,7 +97,15 @@
 			</isNotEmpty>
 
 			<isNotEmpty property="authorCode" > /* 매뉴사용여부 조회 */
-				AND B.AUTHOR_CODE =  #authorCode#
+				
+				<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+					AND (B.AUTHOR_CODE =  #authorCode#
+					OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
+			 		OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
+				</isEqual>
+				<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+					AND B.AUTHOR_CODE =  #authorCode#
+				</isNotEqual>
 			</isNotEmpty>
 			LIMIT 1
 	</select>

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml

@@ -159,6 +159,24 @@
 			</isNotEmpty>
 	</select>
 	
+	<select id="VEAcmdtAplctDAO.selectDetailByUser_r2" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
+			select
+				  vaa.aprvl_cd  as aprvlCd 
+				, vaa.aplct_cn as aplctCn 
+				, vaa.acmdt_fee as acmdtFee
+				, vaa.acmdt_aplct_ord as AcmdtAplctOrd
+			FROM ve_acmdt_aplct vaa
+				, ve_edu_chasi vee
+			WHERE vee.instr_cnfrm_cd ='Y'
+			AND vee.instr_cnfrm_id = #frstRegisterId#
+			AND vee.edu_hope_dt = #eduHopeDt#
+			AND vee.edu_chasi_ord = vaa.edu_chasi_ord
+			ORDER BY aprvl_cd desc
+			limit 1
+			
+			
+	</select>
+	
 	<select id="VEAcmdtAplctDAO.selectDcmdtAplctYesterday" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
 		SELECT 
 			a.schol_instt_nm	AS scholInsttNm 

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Cubrid.xml

@@ -594,7 +594,7 @@
 			,cnt
 			,notiCnt
 		FROM
-			( SELECT
+			( SELECT DISTINCT 
 				 a.user_id				AS userId
 				, a.edu_aplct_ord		AS eduAplctOrd
 				, a.edu_chasi_ord		AS eduChasiOrd
@@ -629,7 +629,8 @@
 				LEFT OUTER JOIN ve_acmdt_aplct d
 					ON (
 						a.edu_aplct_ord = d.edu_aplct_ord
-						AND a.edu_chasi_ord = d.edu_chasi_ord
+						<!-- AND a.edu_chasi_ord = d.edu_chasi_ord -->
+						and d.aplct_cn is not null
 						) 	  
 				LEFT OUTER JOIN ve_instr_fee e
 				ON (
@@ -4788,4 +4789,27 @@
 		
 			
 	</select>	
+	
+	
+	
+	
+		 
+	<!-- 강의내역(확정) 목록. 배정테이블 ID가 본인이면서 코드30(교육확정)-->
+	<select id="VEAsgnmMIXDAO.findByAcmdtCnfrm" parameterClass="VEInstrAsgnmVO" resultClass="VEInstrAsgnmVO">
+	SELECT 
+		vaa.sbmt_yn as acmdtSbmtYn 
+		, vaa.aprvl_cd as acmdtAprvlCd 
+		, vaa.acmdt_fee as acmdtFee 
+	FROM ve_acmdt_aplct vaa
+		, ve_edu_chasi vee
+	WHERE vee.instr_cnfrm_cd ='Y'
+	AND vee.instr_cnfrm_id = #userId#
+	AND vee.edu_hope_dt = #eduHopeDt#
+	AND vee.edu_aplct_ord = vaa.edu_aplct_ord
+	AND vee.edu_chasi_ord = vaa.edu_chasi_ord
+	ORDER BY aprvl_cd desc
+	limit 1
+	</select>
+	
+	
 </sqlMap>

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml

@@ -774,9 +774,6 @@
 		</isEqual>
 			
 		ORDER BY 1=1
-		<isEmpty property="orderByQuery">
-			, A.EDU_APLCT_ORD DESC
-		</isEmpty>
 		<isNotEmpty property="orderByQuery">
 			, $orderByQuery$
 		</isNotEmpty>

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
        		    	   	
 	</sql>
 	
@@ -550,4 +551,18 @@
 			INSTR_DIV = #instrDiv#
 	</update>
 	
+	<!-- 강사 메모 수정 U -->
+	<update id="VEInstrDetailDAO.updateInstrSigMemo" parameterClass="VEInstrDetailVO">
+		UPDATE
+			VE_INSTR_DETAIL
+		SET
+			SIG_MEMO = #sigMemo#
+		WHERE
+			USER_ID = #userId#
+		AND
+			INSTR_DETAIL_ORD = #instrDetailOrd#
+		AND
+			INSTR_DIV = #instrDiv#
+	</update>
+	
 </sqlMap>

src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml

@@ -345,7 +345,10 @@
 	
 				
 		ORDER BY 1=1					
+<!-- 		<isNotNull prepend=" ," property="searchSortCnd"> -->
 			
+<!-- 		</isNotNull> -->
+		
 		<isEmpty property="orderByQuery">
 			, dddd.rsdne asc
 		</isEmpty>
@@ -357,4 +360,65 @@
 		LIMIT #recordCountPerPage# OFFSET #firstIndex#
 					
 	</select>	
+	
+	
+	
+	
+	
+	<select id="VELctrRsrchMngDAO.findByLctrStngOrd" parameterClass="String" resultClass="String">
+	
+
+		select
+				ccc.lctr_stng_ord as lctrStngOrd
+			from
+				(
+				select
+					aa.rsrch_instr_div ,
+					aa.stng_yr_mnt ,
+					aa.rsrch_strt_dt ,
+					aa.rsrch_end_dt ,
+					bb.*
+				from
+					ve_lctr_rsrch_mng aa,
+					(
+						select
+							b.instr_div ,
+							b.user_id 
+						from
+							ve_instr a ,
+							ve_instr_detail b
+						where
+							a.tngr_instr_yn = 'Y'
+							and b.instr_div = '10'
+							and b.user_id = a.user_id
+							and b.use_yn = 'Y' 
+					)bb
+				where
+					aa.rsrch_instr_div = '10'
+					and aa.stng_yr_mnt = #stngYrMnt#  
+				)aaa 
+			left outer join (
+				select
+					c.*
+				from
+					ve_lctr_rsrch_mng a ,
+					ve_lctr_rsrch_sbmt b ,
+					ve_lctr_stng c
+				where
+					a.rsrch_instr_div = '10'
+					and a.stng_yr_mnt = #stngYrMnt#
+					and a.rsrch_instr_div = b.rsrch_instr_div
+					and a.stng_yr_mnt = b.stng_yr_mnt
+					and b.instr_div = c.instr_div
+					and b.user_id = c.user_id
+					and b.lctr_stng_ord = c.lctr_stng_ord /* 제출인것만 제출로 인정 2023-03-14 사용은 하나뿐이므로 use_yn='Y' only one, but sbmt_yn='Y'는 모든 제출에 적용 */
+					and c.sbmt_yn = 'Y' 
+				) ccc 
+				on ccc.instr_div = aaa.instr_div
+					and ccc.user_id = aaa.user_id 
+	
+	
+	</select>
+	
+	
 </sqlMap>

src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp

@@ -318,6 +318,16 @@ function fn_egov_inqire_BBSMngInqire() {
 									<form:errors path="viewsYn" cssClass="error" />
 								</td>
 							</tr>
+							<tr>
+								<th><span class="reqArea">비공개 여부</span></th>
+								<td>
+									<form:select path="secretYn" title="비공개 여부">
+										<form:option value="Y">사용</form:option>
+										<form:option value='N' selected="selected">미사용</form:option>
+									</form:select>
+									<form:errors path="secretYn" cssClass="error" />
+								</td>
+							</tr>
 							<tr>
 								<th><span class="reqArea">게시판 사용여부</span></th>
 								<td>

src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp

@@ -379,6 +379,17 @@ $( document ).ready(function() {
 								</td>
 							</tr>
 							
+							<tr>
+								<th><span class="reqArea">비공개 여부</span></th>
+								<td>
+									<form:select path="secretYn" title="비공개 여부" class="sel_type1">
+										<form:option value="Y">사용</form:option>
+										<form:option value='N'>미사용</form:option>
+									</form:select>
+									<form:errors path="secretYn" cssClass="error" />
+								</td>
+							</tr>
+							
 							<tr>
 								<th><span class="reqArea">게시판 사용여부</span></th>
 								<td>

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp

@@ -22,6 +22,12 @@
 <script type="text/javascript">
 	$(document).ready(function(){
 
+		$('.eduHope').click(function(){
+			var $tag = $('#orderByQuery');
+			$tag.val($(this).data('info'));
+			linkPage(1);
+		});
+		
 	});
 
 	function linkPage(pageNo){
@@ -70,7 +76,8 @@
 	<input type="hidden" name="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' default='1' />"/>
 	<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
 	<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />
-	<input type="hidden" name="eduAplctOrd" value="" />
+	<input type="hidden" name="orderByQuery" id="orderByQuery" value="<c:out value="${vEEduAplctVO.orderByQuery}" />" />
+<!-- 	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" /> -->
 
 	<div class="cont_wrap">
 		<div class="box">
@@ -180,7 +187,16 @@
 						<thead>
 							<tr>
 								<th>번호</th>
-								<th>교육희망일자</th>
+								<th>교육희망일자 
+										<c:choose>
+											<c:when test="${vEEduAplctVO.orderByQuery eq 'asc' }">
+												<img style="cursor:pointer;" class="eduHope" data-info="desc" src="<c:url value='/images/sortUp.png' />" />
+											</c:when>
+											<c:otherwise>
+												<img style="cursor:pointer;" class="eduHope" data-info="asc" src="<c:url value='/images/sortDown.png' />" />
+											</c:otherwise>
+										</c:choose>
+								</th>
 								<th>신청일자</th>
 								<th>신청유형</th>
 								<th>기관(단체)명</th>

src/main/webapp/WEB-INF/jsp/oprtn/cmm/scholPopListBower.jsp

@@ -12,6 +12,7 @@
 <head>
 <title>학교명 검색</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javascript"  src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>  
 <script type="text/javascript" src="${pageContext.request.contextPath}/kccadrPb/usr/script/popup.js"></script>
 <script type="text/javaScript" language="javascript">
 	$(document).ready(function(){

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp

@@ -221,14 +221,63 @@ function replyCalculation(){
 			}
 		});
 	}	
+	
+	
+	
+	
+	
+	// 강사 변경				 
+	function fn_chasiStatusPop() {
+		var form = document.chasiStatusPopForm;
+		
+// 		form.eduAplctOrd.value = aplctOrd;
+// 		form.eduChasiOrd.value = chasiOrd;
+// 		form.strtTm.value = strtTm;
+// 		form.endTm.value = endTm;
+// 		form.asgnmAprvlCd.value = code;
+		
+		//추가 강사 변경			
+// 		form.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/instrAsgnmAddPopup.do'/>";
+console.log("form :: ", form);
+		form.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/chasiStatusPopup.do'/>";
+		
+		
+		window.open("#", "_chasiStatusPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px");    
+		form.target = "_chasiStatusPop";
+		form.submit();  
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 </script>
 
 </head>
 <body>
+<form:form id="chasiStatusPopForm" name="chasiStatusPopForm" action="">
+	<input type="hidden" name="eduAplctOrd" value="<c:out value="${vEEduAplctVO.eduAplctOrd}" />" />
+	<input type="hidden" name="eduChasiOrd" value="<c:out value="${vEEduAplctVO.eduChasiOrd}" />" />
+</form:form>
 <form:form id="listForm" name="listForm" method="post" onsubmit="return false;">
 	<input type="hidden" name="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' />"/>
 	<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
 	<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />
+	
+	<input type="hidden" name="searchSubmitYn" value="<c:out value="${vEEduAplctVO.searchSubmitYn}" />" />
+	<input type="hidden" name="searchScholDivCd" value="<c:out value="${vEEduAplctVO.searchScholDivCd}" />" />
+	<input type="hidden" name="searchEduSlctAreaCd" value="<c:out value="${vEEduAplctVO.searchEduSlctAreaCd}" />" />
+	
+	<input type="hidden" name="searchStartDt" value="<c:out value="${vEEduAplctVO.searchStartDt}" />" />
+	<input type="hidden" name="searchEndDt" value="<c:out value="${vEEduAplctVO.searchEndDt}" />" />
+	
+	<input type="hidden" name="searchCondition" value="<c:out value="${vEEduAplctVO.searchCondition}" />" />
+	<input type="hidden" name="searchKeyword" value="<c:out value="${vEEduAplctVO.searchKeyword}" />" />
 </form:form>
 
 <form id="popForm" name="popForm" method="post">
@@ -622,6 +671,11 @@ function replyCalculation(){
 				</table>
 			</div>
 			</c:if>
+			<div>
+				<div class="btn_right">
+					<button type="button" class="btn_type06" onclick="fn_chasiStatusPop(); return false;">수정</button>
+				</div>
+			</div>
 			<!-- 비공개 메보 정보 -->
 			<div class="tb_tit01">
 				<p>비공개 메모</p>
@@ -704,5 +758,10 @@ function replyCalculation(){
 </div>
 </form:form>
 <!-- //cont -->
+
+
+
+
+
 </body>
 </html>

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);
+			}
+		});
+	}
+	
 
 </script>
 </head>
@@ -300,6 +326,13 @@
 	<input type="hidden" name="memo" id="memo" value="" />
 </form>
 
+<form id="hiddenSigMemoForm" name="hiddenSigMemoForm" method="post">
+	<input type="hidden" name="userId" id="userId" value="<c:out value='${info.userId}'/>"/>	<!-- 사용자 아이디 -->
+	<input type="hidden" name="instrDetailOrd" id="instrDetailOrd" value="<c:out value='${info.instrDetailOrd}'/>"/>
+	<input type="hidden" name="instrDiv" id="instrDiv" value="<c:out value='${info.instrDiv}'/>"/> <!-- 강사구분 -->
+	<input type="hidden" name="sigMemo" id="sigMemo" value="" />
+</form>
+
 <form:form id="detailForm" name="detailForm" commandName="vEInstrDetailVO"  method="post" >
 	<input type="hidden" name="pageIndex" value="<c:out value='${vEInstrDetailVO.pageIndex}'/>"/>
 	<input type="hidden" name="searchStartDt" value="<c:out value="${vEInstrDetailVO.searchStartDt}" />" />
@@ -564,6 +597,31 @@
 					</tbody>
 				</table>
 			</div>
+			
+			<!-- 특이사항 메보 정보 -->
+			<div class="tb_tit01">
+				<p>특이사항 메모</p>
+			</div>
+			<div class="tb_type02">
+				<table>
+					<colgroup>
+						<col style="width: 220px;">
+						<col style="width: auto;">
+					</colgroup>
+						<tr>
+							<th scope="row">
+								<p>내용</p>
+							</th>
+							<td class="tb_alram">
+								<div>
+									<textarea name="sigMemoCn" id="sigMemoCn"><c:out value="${info.sigMemo}" /></textarea>
+									<button type="button" class="btn_type08" onclick="updateHiddenSigMemo(); return false;">메모 저장</button>
+								</div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
 			<!-- 비공개 메보 정보  끝-->
 			<div id="importDiv">
 				<c:import url="/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrLctrStngPopup.do" charEncoding="utf-8"></c:import>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp

@@ -30,6 +30,40 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript">
+	
+		$(document).ready(function(){
+			var $cnd = $('#searchSortCnd');
+			var $ord = $('#searchSortOrd');
+			$('.sort_btn').click(function(){
+				
+				$cnd.val($(this).attr('id').replace('_sort', ''));
+				
+				if($(this).text() == '▼'){
+					$ord.val('asc');
+					$(this).text('▲');
+				}else{
+					$ord.val('desc');
+					$(this).text('▼');
+				}
+				linkPage(1);
+				
+			});
+			
+			sort_init();
+		});
+		
+		function sort_init(){
+			var $cnd = $('#searchSortCnd');
+			var $ord = $('#searchSortOrd');
+
+			
+			if($ord.val() == 'asc'){
+				var idVal ='#'+$cnd.val()+'_sort'; 
+				console.log(idVal);
+				$(idVal).text('▲');
+			}
+			
+		}
 		function fncGoList(){
 			var listForm = document.listForm ;			
 			listForm.stngYrMnt.value = '' ;
@@ -96,8 +130,8 @@
 <body>
 <form:form id="listForm" name="listForm" method="post" commandName="vEInstrDetailVO" onsubmit="return false;">
 	<input type="hidden" name="pageIndex" value="<c:out value='${vELctrDetailVO.pageIndex}' default='1' />"/>
-	<input type="hidden" name="searchSortCnd" value="<c:out value="${vELctrDetailVO.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortCnd" id="searchSortCnd" value="<c:out value="${vELctrDetailVO.searchSortCnd}" />" />
-	<input type="hidden" name="searchSortOrd" value="<c:out value="${vELctrDetailVO.searchSortOrd}" />" />
+	<input type="hidden" name="searchSortOrd" id="searchSortOrd" value="<c:out value="${vELctrDetailVO.searchSortOrd}" />" />
 
 
 	<input type="hidden" name="userId" id="userId" value=""/>	<!-- 사용자 아이디 -->
@@ -190,21 +224,24 @@
 						</colgroup>
 						<thead>
 						<tr>
+<!-- 							<th>이름<button class="sort_btn" id="instrNm_sort">▼</button></th> -->
 							<th>이름</th>
-							<th>구분</th>
+							<th>구분<button class="sort_btn" id="divCd_sort">▼</button></th>
-							<th>거주지역</th>
+							<th>거주지역<button class="sort_btn" id="rsdne_sort">▼</button></th>
-							<th>강의가능지역</th>
+							<th>강의가능지역<button class="sort_btn" id="lctrAreaNm_sort">▼</button></th>
+<!-- 							<th>연락처<button class="sort_btn" id="phone_sort">▼</button></th> -->
 							<th>연락처</th>
-							<th>주5일여부</th>
+							<th>주5일여부<button class="sort_btn" id="wCnt_sort">▼</button></th>
-							<th>자격종료여부</th>
+							<th>자격종료여부<button class="sort_btn" id="qlfctEndYn_sort">▼</button></th>
-							<th>강의조사서제출여부</th>														
+							<th>제출여부<button class="sort_btn" id="lctrStngOrd_sort">▼</button></th>
+<!-- 							<th>강의조사서제출여부<button class="sort_btn">▼</button></th>														 -->
 						</tr>
 						</thead>
 						<tbody>
 						<c:forEach var="list" items="${list}" varStatus="status">
 							<tr>
 								<td>
-									<c:out value="${list.instrNm}"/>																		
+									<c:out value="${list.instrNm}"/>
 									<br/>(${fn:split(list.userId,'_')[1]*1})
 								</td>
 								<td>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp

@@ -37,11 +37,13 @@
 		function linkPage(pageNo){
 			var listForm = document.listForm ;
 			listForm.pageIndex.value = pageNo ;
-			if(listForm.searchStartDt.value > listForm.searchEndDt.value){
+// 			console.log('listForm : ', listForm);
-				alert("시작일은 종료일보다 작아야합니다.");
+// 			if(listForm.searchStartDt.value > listForm.searchEndDt.value){
-				return;
+// 				alert("시작일은 종료일보다 작아야합니다.");
-			}
+// 				return;
-			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/lctrRsrchMngList.do'/>";
+// 			}
+// 			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/lctrRsrchMngList.do'/>";
+			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngList.do'/>";
 			listForm.submit();
 		}
 
@@ -56,14 +58,14 @@
 		function fncGoReg(){
 			var listForm = document.listForm ;
 			listForm.instrDiv.value = "10" ;
-			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctReg.do'/>";
+			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/instrAplctReg.do'/>";
 			listForm.submit();
 		}
 		
 		function fncGoRegExcel(){
 			var listForm = document.listForm ;
 			listForm.instrDiv.value = "10" ;
-			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctRegExcel.do'/>";
+			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/instrAplctRegExcel.do'/>";
 			listForm.submit();
 		}		
 
@@ -232,7 +234,8 @@
 							<th>강의조사월</th>
 							<th>조사시작일</th>
 							<th>조사마감일</th>
-							<th>마감여부</th>							
+							<th>참여현황</th>
+							<th>마감여부</th>
 						</tr>
 						</thead>
 						<tbody>
@@ -253,9 +256,11 @@
 																	
 								</td>
 								<td>
-									<fmt:parseDate value="${list.rsrchEndDt}" var="rsrchEndDt" pattern="yyyyMMdd"/>
+								
-									<fmt:formatDate value="${rsrchEndDt}" pattern="yyyy.MM.dd"/>
+								 ${list.lctrStngOrdSbmt } / ${list.lctrStngOrdTtl }
-																	
+								</td>
+								<td>
+									<ve:code codeId="VE0034" code="${list.rsrchState }"/>           
 								</td>
 							</tr>
 						</c:forEach>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp

@@ -0,0 +1,424 @@
+<!DOCTYPE html>
+<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%
+	/**
+	 * @Class Name : instrAsgnmAddPopup.jsp
+	 * @Description : 강사배치 추가강의 팝업
+	 * @Modification Information
+	 * @
+	 * @  수정일      수정자          수정내용
+	 * @  -------     --------    ---------------------------
+	 * @ 2021.08.09   김봉호          최초 생성
+	 *  @author 안주영
+	 *  @since 2022.1.8
+	 *  @version 1.0
+	 *  @see
+	 *
+	 */
+%>
+<html lang="ko">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		
+<%-- 	<script type="text/javascript" src="<c:url value='/js/ve/tmapJS.js'/>"></script> --%>
+	
+	<script type="text/javascript">
+	</script>
+	<title>강사배치 팝업</title>
+	<script type="text/javaScript" language="javascript">
+	    $(document).ready(function() {
+        });
+		
+		
+	</script>
+</head>
+<body>
+
+<!-- ============================================================ -->
+<!-- ============================================================ -->
+<!-- ============================================================ -->
+
+<form id="srvyPopupForm" name="srvyPopupForm" method="post">
+	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="eduAplct_00000001371">
+	<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="eduChasi_00000001585">
+	<input type="hidden" name="qestnrId" id="qestnrId" value="QMANAGE_000000000400">
+	<input type="hidden" id="qestmInfoSize" value="8">
+	<div class="tooltip-wrap">
+		<div class="popup_wrap popType05" tabindex="0" data-tooltip-con="sub37_pop01" data-focus="sub37_pop01" data-focus-prev="sub37_pop01_close" style="width: 800px; display: block; left: 666.5px; top: 75.1145px;">
+			<div class="popup_tit">
+				<p>강의만족도 결과 등록</p>
+				<button class="btn_popup_close tooltip-close" data-focus="sub37_pop01_close" title="팝업 닫기"><i></i></button>
+			</div>
+			<div class="popup_cont">
+				<div class="cont_body">
+					<div class="pop_tb_type02">
+						<table>
+							<caption>교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공</caption>
+							<colgroup>
+								<col style="width: 10%;">
+								<col style="width: 15%;">
+								<col style="width: 8%;">
+								<col style="width: 10%;">
+								<col style="width: 10%;">
+								<col style="width: 8%;">
+								<col style="width: 10%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<th scope="col">교육일</th>
+									<th scope="col">차시</th>
+									<th scope="col">구분</th>
+									<th scope="col">대상</th>
+									<th scope="col">배정강사</th>
+									<th scope="col">인원</th>
+									<th scope="col">설문완료 여부</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<th scope="row" id="popupEduHopeDt">2022-03-30</th>
+									<td id="popupTm">14:10~15:35(85분)</td>
+									<td id="popupDivCd">10</td>
+									<td id="popupTrgt">1-1반</td>
+									<td id="popupInstrNm">원영현</td>
+									<td id="popupPrsnl">55</td>
+									<td id="popupSrvyStatus">설문진행중</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+					<div class="pop_tb_type01">
+						<table>
+							<caption>참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력</caption>
+							<colgroup>
+								<col style="width: 120px;">
+								<col style="width: auto;">
+								<col style="width: 120px;">
+								<col style="width: auto;">
+							</colgroup>
+							<tbody>
+								<tr>
+									<th scope="row">
+										<p>참석자</p>
+									</th>
+									<td>
+										<label for="qestnrParticipant" class="label">참석자 수 입력</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 50%;" id="qestnrParticipant" name="qestnrParticipant" value="">
+									</td>
+									<th scope="row">
+										<p>응답율</p>
+									</th>
+									<td id="responseRate">-</td>
+								</tr>
+								<tr>
+									<th scope="row">
+										<p>응답자</p>
+									</th>
+									<td>
+										<label for="qestnrRespondent" class="label">응답자 수 입력</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 50%;" id="qestnrRespondent" name="qestnrRespondent" value="" onblur="replyCalculation(); return false;">
+									</td>
+									<th scope="row">
+										<p>무응답</p>
+									</th>
+									<td id="noResponse">-</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+
+					<div class="pop_tb_type02">
+						<table>
+							<caption>평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력</caption>
+							<colgroup>
+								<col style="width: auto;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+								<col style="width: 12%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<th scope="col">평가문항</th>
+									<th scope="col">매우만족</th>
+									<th scope="col">만족</th>
+									<th scope="col">보통</th>
+									<th scope="col">불만족</th>
+									<th scope="col">매우불만족</th>
+								</tr>
+							</thead>
+							<tbody>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										1) 본 교육운영에 대하여 전반적으로 만족하십니까?	
+										
+										<input type="hidden" name="resultList[0].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[0].qestnrQesitmId" value="QQESTN_0000000000510">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_0" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_0" name="resultList[0].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_0" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_0" name="resultList[0].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_0" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_0" name="resultList[0].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_0" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_0" name="resultList[0].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_0" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_0" name="resultList[0].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										2) 본 교육 내용구성에 대해서는 어느 정도 만족 하십니까?
+										
+										<input type="hidden" name="resultList[1].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[1].qestnrQesitmId" value="QQESTN_0000000000511">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_1" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_1" name="resultList[1].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_1" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_1" name="resultList[1].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_1" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_1" name="resultList[1].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_1" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_1" name="resultList[1].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_1" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_1" name="resultList[1].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										3) 교육 시간은 적절했다고 생각하십니까?	
+										
+										<input type="hidden" name="resultList[2].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[2].qestnrQesitmId" value="QQESTN_0000000000512">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_2" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_2" name="resultList[2].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_2" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_2" name="resultList[2].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_2" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_2" name="resultList[2].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_2" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_2" name="resultList[2].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_2" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_2" name="resultList[2].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										4) 본 교육을 받기 전 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까?	
+										
+										<input type="hidden" name="resultList[3].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[3].qestnrQesitmId" value="QQESTN_0000000000513">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_3" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_3" name="resultList[3].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_3" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_3" name="resultList[3].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_3" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_3" name="resultList[3].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_3" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_3" name="resultList[3].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_3" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_3" name="resultList[3].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										5) 본 교육을 받은 후, 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까?	
+										
+										<input type="hidden" name="resultList[4].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[4].qestnrQesitmId" value="QQESTN_0000000000514">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_4" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_4" name="resultList[4].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_4" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_4" name="resultList[4].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_4" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_4" name="resultList[4].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_4" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_4" name="resultList[4].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_4" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_4" name="resultList[4].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										6) 본 교육을 통해, 학교 수업 혹은 직무에 얼마나 도움이 될 것이라고 생각하십니까?	
+										
+										<input type="hidden" name="resultList[5].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[5].qestnrQesitmId" value="QQESTN_0000000000515">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_5" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_5" name="resultList[5].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_5" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_5" name="resultList[5].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_5" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_5" name="resultList[5].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_5" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_5" name="resultList[5].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_5" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_5" name="resultList[5].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										7) 강사가 교육 5분 전까지 도착했나요?(지각여부_교사 only)
+										
+										<input type="hidden" name="resultList[6].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[6].qestnrQesitmId" value="QQESTN_0000000000520">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_6" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_6" name="resultList[6].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_6" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_6" name="resultList[6].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_6" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_6" name="resultList[6].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_6" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_6" name="resultList[6].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_6" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_6" name="resultList[6].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+								<tr>
+									<th scope="row" class="t_left">
+										8) 본 교육과 관련하여 강사가 교육 5분 전까지 도착했습니까?(지각여부확인_교사만)	
+										
+										<input type="hidden" name="resultList[7].qestnrId" value="QMANAGE_000000000400">
+										<input type="hidden" name="resultList[7].qestnrQesitmId" value="QQESTN_0000000000516">
+										
+									</th>
+									<td>
+										<label for="verySatisfied_7" class="label">매우만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우만족" id="verySatisfied_7" name="resultList[7].verySatisfied" value="0">
+									</td>
+									<td>
+										<label for="satisfied_7" class="label">만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="만족" id="satisfied_7" name="resultList[7].satisfied" value="0">
+									</td>
+									<td>
+										<label for="neither_7" class="label">보통</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="보통" id="neither_7" name="resultList[7].neither" value="">
+									</td>
+									<td>
+										<label for="dissatisfied_7" class="label">불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="불만족" id="dissatisfied_7" name="resultList[7].dissatisfied" value="">
+									</td>
+									<td>
+										<label for="veryDissatisfied_7" class="label">매우불만족</label>
+										<input type="text" numberonly="" class="popupInput" style="width: 70%;padding:0 5px;text-align:center;" title="매우불만족" id="veryDissatisfied_7" name="resultList[7].veryDissatisfied" value="">
+									</td>
+								</tr>
+								
+							</tbody>
+						</table>
+					</div>
+
+					<div class="pop_btn_wrap btn_layout01">
+						<div class="btn_left">
+						</div>
+						<div class="btn_center">
+							
+							<button type="button" class="btnType05" id="popupSubmin" onclick="srvySendSubmit();">제출</button>
+							
+							<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button>
+						</div>
+						<div class="btn_right">
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
+
+
+</body>
+</html>

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 {
+   html, body {height:auto;margin: 0 !important;padding: 0 !important;overflow: hidden;page-break-after: avoid;}
-  		page-break-before: always;
+   .cont_tit {page-break-before: always;}
-  	}
+   .page_break {page-break-inside:avoid; page-break-after:auto}
-
+   .print_mark {page-break-before: auto;}
-	.page_break {
+   form{display: none;}     
-  		page-break-before: always;
-		height: 40px;	
-  	}
-  	
-	.print_mark {
-  		page-break-before: auto;
-  	}  	
 }
 
 </style>
@@ -155,7 +148,15 @@
 							<th scope="row">
 								<p>교육장소</p>
 							</th>
-							<td colspan="3"><c:out value="${info.eduPlace}" /></td>
+							<td colspan="3">
+								<c:out value="${info.eduPlace}" />
+								<p style="padding-left:10%; display:inline-block;">
+									<input type="checkbox" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if> disabled="disabled"> 집체교육
+								</p>
+								<p style="padding-left:20px; display:inline-block;">
+									<input type="checkbox" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if> disabled="disabled"> 방송실교육
+								</p>
+							</td>
 						</tr>
 						<tr>
 							<th scope="row">
@@ -183,7 +184,7 @@
 							</th>
 							<td colspan="3">
 								<c:choose>
-									<c:when test="${info.useYn eq 'N'}">
+									<c:when test="${info.useYn eq 'N' or info.aprvlCd eq '40'}">
 										<span class="app_status3">신청취소</span>
 									</c:when>
 									<c:when test="${info.sbmtYn eq 'N' or empty info.sbmtYn}">
@@ -192,12 +193,24 @@
 									<c:when test="${info.aprvlCd eq '10'}">
 										<span class="app_status1">교육신청</span>
 									</c:when>
+									<c:when test="${info.aprvlCd eq '230'}">
+										<span class="app_status1">대기</span>
+									</c:when>
 									<c:when test="${info.aprvlCd eq '20'}">
-										<span class="app_status1">교육확정</span>
+										<span class="app_status1">교육승인</span>
 									</c:when>
 									<c:when test="${info.aprvlCd eq '30'}">
 										<span class="app_status1">교육반려</span>
 									</c:when>
+									<c:when test="${info.aprvlCd eq '60'}">
+										<span class="app_status1">교육확정</span>
+									</c:when>									
+									<c:when test="${info.aprvlCd eq '70'}">
+										<span class="app_status1">수정요청<c:if test="${info.isWait eq 'Y'}">(대기)</c:if></span>
+									</c:when>
+									<c:when test="${info.aprvlCd eq '80'}">
+										<span class="app_status1">수정완료<c:if test="${info.isWait eq 'Y'}">(대기)</c:if></span>
+									</c:when>
 									<c:otherwise>
 										-
 									</c:otherwise>
@@ -214,9 +227,9 @@
 						</c:if>
 					</tbody>
 				</table>
+			<p class="page_break"></p>
+			<br/>
 
-
-			<div class="page_break"></div>
 			<div class="pop_tb_tit01">
 				<p>교육차시 정보</p>
 			</div>
@@ -235,6 +248,7 @@
 							<th scope="col">시간</th>
 							<th scope="col">구분</th>
 							<th scope="col">대상</th>
+							<th scope="col">배정강사</th>
 							<th scope="col">인원</th>
 						</tr>
 					</thead>
@@ -264,6 +278,15 @@
 									<ve:code codeId="VE0010" code="${list.divCd}"/>
 								</td>
 								<td><c:out value="${list.trgt}" /></td>
+								<td>
+									<c:out value="${cryptoUtil.decrypt(list.instrNm)}"/>
+									<c:if test="${list.instrNm eq null}">
+										-
+									</c:if>
+									<c:if test="${list.instrNm ne null}">
+										<br/>(${fn:split(list.userId,'_')[1]*1})
+									</c:if>											
+								</td>
 								<td><c:out value="${list.prsnl}" /></td>
 							</tr>
 						</c:forEach>

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(){
 }
 
 </script>
-<title>로그인 로그 목록</title>
 </head>
 <body>
 <noscript>자바스크립트를 지원하지 않는 브라우저에서는 일부 기능을 사용하실 수 없습니다.</noscript>
@@ -137,35 +136,88 @@ function fnCheckAll(){
 	<input type="hidden" name="pageType" value="" />
 	<input type="hidden" name="admotId" value="" />
 	
-	<div class="contWrap">
+	
-		<div class="pageTitle">
+
-			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
+	
-			<h2 class="titType1 c_222222 fwBold">관리자로그설정관리</h2>
+		<div class="cont_wrap">
-			<p class="tType6 c_999999">관리자 로그 설정을 관리할 수 있습니다.</p>
+			<div class="box">
-		</div>
+				<!-- cont_tit -->
-		<div class="pageCont">
+				<div class="cont_tit">
-			<div class="listSerch">
+					<h2>관리자로그설정관리</h2>
-				<select name="searchCondition" id="searchCondition" class="select" title="검색조건선택">
+					<ul class="cont_nav">
-				   	<option value='' <c:if test="${searchVO.searchCondition == ''}">selected</c:if> >전체</option>
+						<li class="home"><a href="/"><i></i></a></li>
-				   	<option value='1' <c:if test="${searchVO.searchCondition == '1'}">selected</c:if>>매뉴명</option>
+						<li>
-				   	<option value='2' <c:if test="${searchVO.searchCondition == '2'}">selected</c:if>>메소드명</option>
+							<p>운영관리</p>
-			    </select>
+						</li>
-			    <input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="25" title="검색" maxlength="50"/>
+						<li><span class="cur_nav">관리자로그설정관리</span></li>
-				<input type="button" class="btnType1" value="검색" onclick="fn_select('1'); return false;">
+					</ul>
-			</div>
-			<div class="listTop">
-				<p class="tType5">건수 : <span class="tType4 c_456ded fwBold"><c:out value="${paginationInfo.totalRecordCount}"/></span>건</p>
-				<div class="rightWrap">
-					<!-- <input type="button" class="excelBtn" onclick="javascript:logListExcelDownload();"> -->
-					<input type="button" class="printBtn" >
-					<select name="pageUnit" id="pageUnit" class="select" title="검색조건선택" onchange="linkPage(1);">
-					   <option value='10' <c:if test="${searchVO.pageUnit == '10' or searchVO.pageUnit == ''}">selected</c:if>>10줄</option>
-					   <option value='20' <c:if test="${searchVO.pageUnit == '20'}">selected</c:if>>20줄</option>
-					   <option value='30' <c:if test="${searchVO.pageUnit == '30'}">selected</c:if>>30줄</option>
-					</select>
 				</div>
-			</div>
+				<!-- //cont_tit -->
-			<div class="tableWrap">
+
+				<div class="cont">
+					<!-- list_top -->
+					<div class="list_top">
+						<div class="list_top_1">
+							<div class="util_left">
+								<p>조회조건</p>
+							</div>
+							<div class="util_right">
+								<select class="sel2 searchSel sel_type1" id="searchCondition" name="searchCondition" title="조회조건">							
+								   	<option value='' <c:if test="${searchVO.searchCondition == ''}">selected</c:if> >전체</option>
+								   	<option value='1' <c:if test="${searchVO.searchCondition == '1'}">selected</c:if>>매뉴명</option>
+								   	<option value='2' <c:if test="${searchVO.searchCondition == '2'}">selected</c:if>>메소드명</option>
+								</select>
+								
+								<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword}'/>" class="search_input" placeholder="검색어를 입력하세요">									
+								<button class="btn_type08" onclick="fn_select('1'); return false;">검색</button>																							
+								
+							</div>
+						</div>												
+						
+						<!-- 
+						<div class="list_top_2">
+							<div class="util_left">
+								<p>접속일자</p>
+							</div>
+							<div class="util_right">
+								<div class="calendar_wrap">
+									<input type="text" class="calendar" title="시작일 선택" id="searchStartDt" name="searchStartDt" value="${searchVO.searchStartDt}">
+								</div>
+								~
+								<div class="calendar_wrap">
+									<input type="text" class="calendar" title="종료일 선택" id="endDate" name="searchEndDt" value="${searchVO.searchEndDt}">
+								</div>
+							</div>
+						</div>
+						 -->
+						 						
+					</div>
+					<!-- //list_top -->
+
+					<!-- list util -->
+					<div class="list_util">
+						<p class="list_util_p">총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}" /></span>건</p>
+						<div>
+							<select class="sel_type1" name="pageUnit" id="pageUnit"  onchange="linkPage(1);" title="줄 선택" style="width: 140px">
+								<option value='10' <c:if test="${searchVO.pageUnit == '10' or searchVO.pageUnit == ''}">selected</c:if>>10줄</option>
+						   		<option value='20' <c:if test="${searchVO.pageUnit == '20'}">selected</c:if>>20줄</option>
+						   		<option value='30' <c:if test="${searchVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+						   		<option value='100' <c:if test="${searchVO.pageUnit == '100'}">selected</c:if>>100줄</option>
+						   										
+							</select>
+							<!-- 
+							<button type="button" class="btn_type03" onclick="fncPrintListPopup(); return false;">신청서 일괄출력</button>
+							<button type="button" class="btn_down_excel" onclick="excelDownLoad();">엑셀 다운로드</button>
+							 -->
+						</div>
+					</div>
+						
+						
+						
+				<!-- list -->
+				<div class="list tb_type01">
+				
+				
 				<table class="tbType1">
 					<colgroup>
 						<col style="width: 8%">
@@ -188,7 +240,7 @@ function fnCheckAll(){
 							<th>파라미터 <input type="button" class="sortBtn sort" id="sort_param"></th>
 							<th>개인정보여부 <input type="button" class="sortBtn sort" id="sort_privacy"></th>
 							<th>등록일자 <input type="button" class="sortBtn sort" id="sort_creatDt"></th>
-							<th>게시판관리</th>
+							<th>관리</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -221,28 +273,47 @@ function fnCheckAll(){
 		         		</c:if>
 	         		</tbody>
 				</table>
-			</div>
+				
-			<div class="btnWrap">
+								
-				<input type="button" class="btnType2" value="삭제" onclick="fn_delete(); return false;">
+				
-				<input type="button" class="btnType1" value="등록" onclick="fn_insert(); return false;">
+				</div>
-			</div>
+				<!-- //list -->
-			<!-- 페이지 네비게이션 시작 -->
+				
-			<c:if test="${!empty logMethodList}">
+				<!-- btn_wrap -->
-		 		<div class="page">
+				 
+				<!-- btn_wrap -->
+				<div class="btn_wrap btn_layout01">
+					<div class="area_right">
+						<button type="button" class="btnType02"  onclick="fncDeleteGroupPolicy(); return false;">삭제</button>
+					</div>
+					<div class="area_right">
+						<button type="button" class="btnType02"  onclick="fncInsertLoginGroupPolicy(); return false;">등록</button>
+					</div>
+				</div>
+				<!-- //btn_wrap -->
+				
+				<!-- 페이지 네비게이션 시작 -->
+				<c:if test="${!empty logMethodList}">
+				<div class="page">
 					<ul class="inline">
-		    			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+						<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
-		    		</ul>	
+					</ul>
-		    	</div>  
+				</div>
-		  	</c:if>                      
+				</c:if> 
-		    <!-- //페이지 네비게이션 끝 --> 
+				<!-- //페이지 네비게이션 끝 -->
+			</div>
 		</div>
 	</div>
+	<!-- //cont -->
+
 </form>
+<!-- 
 <form name="searchForm" method="get" action="<c:url value='/sym/log/clg/SelectLoginLogList.do'/>">
 	<input name="pageIndex" type="hidden" value="1" />
 	<input name="searchCondition" type="hidden"   />
 	<input name="searchKeyword" type="hidden" />
 	<input name="searchConditionSite" type="hidden" />
 </form>
+ -->
 </body>
 </html>

src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp

@@ -149,11 +149,10 @@ function webLogListExcelDownload(){
     document.frm.submit(); 
 }
 </script>
-<title>로그인 로그 목록</title>
 </head>
 <body>
 <noscript>자바스크립트를 지원하지 않는 브라우저에서는 일부 기능을 사용하실 수 없습니다.</noscript>
-<form name="frm" id="frm" action ="<c:url value='/sym/log/clg/SelectLoginLogList.do'/>" method="post">
+<form name="frm" id="frm" action ="<c:url value='/sym/log/clg/SelectWebLogList.do'/>" method="post">
     <input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/>
 	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
 	<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
@@ -162,56 +161,86 @@ function webLogListExcelDownload(){
 	
 	<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
 	<input type="hidden" name="progrmFileNm" value="" />
-	<div class="contWrap">
+	
-		<div class="pageTitle">
+	
-			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
+		<div class="cont_wrap">
-			<h2 class="titType1 c_222222 fwBold">사용자메뉴별접속통계</h2>
+			<div class="box">
-			<p class="tType6 c_999999">사용자메뉴별접속통계 파악할 수 있습니다.</p>
+				<!-- cont_tit -->
-		</div>
+				<div class="cont_tit">
-		<div class="pageCont">
+					<h2>사용자매뉴별접속통계</h2>
-			<div class="listSerch">
+					<ul class="cont_nav">
-				<select name="searchCondition" id="searchCondition" class="select" title="검색조건선택">
+						<li class="home"><a href="/"><i></i></a></li>
-				   	<option value='' <c:if test="${searchVO.searchCondition == ''}">selected</c:if> >전체</option>
+						<li>
-				   	<option value='1' <c:if test="${searchVO.searchCondition == '1'}">selected</c:if>>메뉴명</option>
+							<p>운영관리</p>
-			    </select>
+						</li>
-			    
+						<li><span class="cur_nav">사용자매뉴별접속통계</span></li>
-			    <select name="dateType" id="dateType" class="select" title="검색조건선택">
+					</ul>
-				   	<option value='D' <c:if test="${searchVO.dateType == 'D'}">selected</c:if>>일별</option>
-				   	<option value='M' <c:if test="${searchVO.dateType == 'M'}">selected</c:if>>월별</option>
-				   	<option value='Y' <c:if test="${searchVO.dateType == 'Y'}">selected</c:if>>년별</option>
-			    </select>
-			    
-				<input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="25" title="검색" maxlength="50"/>
-				<input type="button" class="btnType1" value="검색" onclick="fn_select('1'); return false;">
-			</div>
-			
-			<div class="listTop">
-				<p class="tType5">리스트 수 : <span class="tType4 c_456ded fwBold"><c:out value="${paginationInfo.totalRecordCount}"/></span>건</p>
-				
-				<td colspan="3">
-					<input type="hidden" name="cal_url" id="cal_url" value="<c:url value='/sym/cmm/EgovNormalCalPopup.do'/>" >
-				    <input type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="10" maxlength="10" class="readOnlyClass" value="<c:out value="${searchVO.searchBgnDe}"/>" readonly >
-				    <a href="#" onClick="javascript:fn_egov_NormalCalendar(document.forms.frm, document.forms.frm.ntceBgndeYYYMMDD);">
-						<input type="button" class="calBtn">
-				    </a>
-				    &nbsp;&nbsp;~&nbsp;&nbsp;
-				    <input type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="10" maxlength="10" class="readOnlyClass" value="<c:out value="${searchVO.searchEndDe}"/>" readonly >
-				    <a href="#" onClick="javascript:fn_egov_NormalCalendar(document.forms.frm, document.forms.frm.ntceEnddeYYYMMDD);">
-				    	<input type="button" class="calBtn">
-				    </a>
-				</td>
-					
-				<div class="rightWrap">
-					<input type="button" class="excelBtn" onclick="javascript:webLogListExcelDownload();">
-					<input type="button" class="printBtn" >
-					<%-- <select name="pageUnit" id="pageUnit" class="select" title="검색조건선택" onchange="linkPage(1);">
-					   <option value='10' <c:if test="${searchVO.pageUnit == '10' or searchVO.pageUnit == ''}">selected</c:if>>10줄</option>
-					   <option value='20' <c:if test="${searchVO.pageUnit == '20'}">selected</c:if>>20줄</option>
-					   <option value='30' <c:if test="${searchVO.pageUnit == '30'}">selected</c:if>>30줄</option>
-					</select> --%>
 				</div>
-			</div>
+				<!-- //cont_tit -->
-			<div class="tableWrap">
+
+				<div class="cont">
+					<!-- list_top -->
+					<div class="list_top">
+						<div class="list_top_1">
+							<div class="util_left">
+								<p>조회조건</p>
+							</div>
+							<div class="util_right">
+								<select class="sel2 searchSel sel_type1" id="searchCondition" name="searchCondition" title="조회조건">							
+									<option value='' <c:if test="${searchVO.searchCondition == ''}">selected</c:if> >전체</option>
+						   			<option value='1' <c:if test="${searchVO.searchCondition == '1'}">selected</c:if>>메뉴명</option>
+						   			<option value='2' <c:if test="${searchVO.searchCondition == '2'}">selected</c:if>>URL</option>
+								</select>
+								
+								<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword}'/>" class="search_input" placeholder="검색어를 입력하세요">									
+								<button class="btn_type08" onclick="fn_select('1'); return false;">검색</button>
+								<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>															
+								
+							</div>
+						</div>
+						
+						<div class="list_top_2">
+							<div class="util_left">
+								<p>접속일자</p>
+							</div>
+							<div class="util_right">
+								<div class="calendar_wrap">
+									<input type="text" class="calendar" title="시작일 선택" id="searchStartDt" name="searchStartDt" value="${searchVO.searchStartDt}">
+								</div>
+								~
+								<div class="calendar_wrap">
+									<input type="text" class="calendar" title="종료일 선택" id="endDate" name="searchEndDt" value="${searchVO.searchEndDt}">
+								</div>
+							</div>
+						</div>
+						
+					</div>
+					<!-- //list_top -->
+
+					<!-- list util -->
+					<div class="list_util">
+						<p class="list_util_p">총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}" /></span>건</p>
+						<div>
+							<select class="sel_type1" name="pageUnit" id="pageUnit"  onchange="linkPage(1);" title="줄 선택" style="width: 140px">
+								<option value='10' <c:if test="${searchVO.pageUnit == '10' or searchVO.pageUnit == ''}">selected</c:if>>10줄</option>
+						   		<option value='20' <c:if test="${searchVO.pageUnit == '20'}">selected</c:if>>20줄</option>
+						   		<option value='30' <c:if test="${searchVO.pageUnit == '30'}">selected</c:if>>30줄</option>
+						   		<option value='100' <c:if test="${searchVO.pageUnit == '100'}">selected</c:if>>100줄</option>
+						   										
+							</select>
+							<!-- 
+							<button type="button" class="btn_type03" onclick="fncPrintListPopup(); return false;">신청서 일괄출력</button>
+							<button type="button" class="btn_down_excel" onclick="excelDownLoad();">엑셀 다운로드</button>
+							 -->
+						</div>
+					</div>
+						
+						
+						
+				<!-- list -->
+				<div class="list tb_type01">
+				
+				
 				<table class="tbType1">
 					<colgroup>
 						<col style="width: 5%">
@@ -266,28 +295,48 @@ function webLogListExcelDownload(){
 		         		</c:if>
 					</tbody>
 				</table>
-			</div>
+				
-			<div class="btnWrap">
+								
-			
+				
-			</div>
+				</div>
-			<c:if test="${!empty adminLogList}">
+				<!-- //list -->
-			<div class="page">
+				
+				<!-- btn_wrap -->
+				<!-- 
+				<div class="btn_wrap btn_layout01">
+					<div class="area_left">
+						<button type="button" class="btnType03"  onclick="fncDeleteGroupPolicy(); return false;">삭제</button>
+					</div>
+					<div class="area_right">
+						<button type="button" class="btnType02"  onclick="fncInsertLoginGroupPolicy(); return false;">등록</button>
+					</div>
+				</div>
+				 -->
+				<!-- //btn_wrap -->
+				
 				<!-- 페이지 네비게이션 시작 -->
-				<ul class="inline">
+				<c:if test="${!empty userMenuList}">
-	    			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+				<div class="page">
-	    		</ul>	
+					<ul class="inline">
-			    <!-- //페이지 네비게이션 끝 --> 
+						<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+					</ul>
+				</div>
+				</c:if> 
+				<!-- //페이지 네비게이션 끝 -->
 			</div>
-		  	</c:if>                      
 		</div>
 	</div>
+	<!-- //cont -->
+
 </form>
+<!-- 
 <form name="searchForm" method="get" action="<c:url value='/sym/log/clg/SelectLoginLogList.do'/>">
 	<input name="pageIndex" type="hidden" value="1" />
 	<input name="searchCondition" type="hidden"   />
 	<input name="searchKeyword" type="hidden" />
 	<input name="searchConditionSite" type="hidden" />
 </form>
+ -->
 <c:import url="/uss/umt/IncInfoProtect.do" />
 </body>
 </html>

src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp

@@ -1,42 +1,133 @@
 <%--
-  Class Name : FmsFileModify.jsp
+  Class Name : SelectLogMethodList.jsp
-  Description : 첨부파일 수정 페이지
+  Description : 로그인 로그 정보목록 화면
   Modification Information
-
+ 
       수정일         수정자                   수정내용
     -------    --------    ---------------------------
-     2009.09.16    장동한          최초 생성
+     2009.03.11  이삼섭              최초 생성
-
+     2011.08.31   JJY       경량환경 버전 생성
-    author   : 공통서비스 개발팀 장동한
+ 
-    since    : 2009.09.16
+    author   : 공통서비스 개발팀  이삼섭
-
+    since    : 2009.03.11  
-    Copyright (C) 2009 by MOPAS  All right reserved.
 --%>
-<%@ 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"%>
-<c:set var="ImgUrl" value="${pageContext.request.contextPath}/images/egovframework/com/cmm/" />
-<c:set var="CssUrl" value="${pageContext.request.contextPath}/css/egovframework/com/" />
-<c:set var="JsUrl"  value="${pageContext.request.contextPath}/js/egovframework/com/uss/ion/pwm/"/>
 <!DOCTYPE html>
-<html lang="ko">
+<html>
 <head>
-<title>팝업창관리 관리</title>
+<meta http-equiv="Content-Language" content="ko" >
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="<c:url value='/js/EgovCalPopup.js'/>" ></script>
-<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
+<script type="text/javascript">
-<script type="text/javaScript" language="javascript">
 $( document ).ready(function(){
+	var tempSearchBgnDe =  "${searchVO.searchBgnDe}" ;
+	var tempSearchEndDe =  "${searchVO.searchEndDe}" ;
+	if(""!=tempSearchBgnDe && tempSearchBgnDe.length==8){
+		$('#searchBgnDe').val(tempSearchBgnDe.substring(0,4)+"-"+tempSearchBgnDe.substring(4,6)+"-"+tempSearchBgnDe.substring(6,8));
+	}
 	
+	if(""!=tempSearchEndDe && tempSearchEndDe.length==8){
+		$('#searchEndDe').val(tempSearchEndDe.substring(0,4)+"-"+tempSearchEndDe.substring(4,6)+"-"+tempSearchEndDe.substring(6,8));
+	}
 });
 
+/* ********************************************************
+* PROTOTYPE JS FUNCTION
+******************************************************** */
+String.prototype.trim = function(){
+    return this.replace(/^\s+|\s+$/g, "");
+}
+
+String.prototype.replaceAll = function(src, repl){
+     var str = this;
+     if(src == repl){return str;}
+     while(str.indexOf(src) != -1) {
+        str = str.replace(src, repl);
+     }
+     return str;
+}
+
+function fn_select(pageNo){
+	<%--<c:if test="${!empty loginId}">
+	if(""!= document.frm.searchKeyword.value){
+		updateRecentSearch();//최근검색어 등록
+	}
+	</c:if>--%>
+    linkPage(1);
+} 
+
+function fn_egov_select_loginLog(pageNo){
+	linkPage(1);
+}
+  
+function fn_egov_inqire_loginLog(logId){
+    var url = "<c:url value ='/sym/log/clg/InqireLoginLog.do?logId='/>" + logId;
+    
+    var openParam = "scrollbars=yes,toolbar=0,location=no,resizable=0,status=0,menubar=0,width=640,height=320,left=0,top=0"; 
+    window.open(url,"p_loginLogInqire", openParam);
+}
+   
+function linkPage(pageNo){
+	var frm = document.frm;
+	frm.pageIndex.value = pageNo;
+	frm.action = "<c:url value='/sym/log/clg/SelectLogMethodList.do'/>";
+	frm.submit();
+}
+    
+//엑셀 다운로드
+function logListExcelDownload(){
+    document.frm.method = "post"; 
+    document.frm.action = "<c:url value='/sym/log/clg/roleListExcelDownload.do'/>";
+    document.frm.submit(); 
+}
+
+/* 등록 */
+function fn_insert(){
+	var frm = document.frm;
+	frm.pageType.value="Insert" ;
+	frm.action = "<c:url value='/sym/log/clg/ViewLogMethod.do'/>";
+	frm.submit();
+}
+
+/* 수정 */
+function fn_modify(id){
+	var frm = document.frm;
+	frm.pageType.value="Insert" ;
+	frm.admotId.value = id;
+	frm.pageType.value = "Modify";
+	//frm.action = "<c:url value='/uss/ion/cnf/metaTagModifyView.do'/>";
+	frm.action = "<c:url value='/sym/log/clg/ViewLogMethod.do'/>";
+	frm.submit();
+}
+
+/* 삭제 */
+function fn_delete(){
+	if($("input:checkbox[name='del']").is(":checked")==true){	
+        if(confirm("삭제하시겠습니까?")) {
+            document.frm.action = "<c:url value='/sym/log/clg/DeleteLogMethod.do'/>";
+            document.frm.submit();
+        }
+    }else{
+    	alert("선택된 항목이 없습니다.");
+    	return false;
+    }	
+}
+function fnCheckAll(){
+	if( $("#checkAll").is(':checked') ){
+		  $("input[name=del]").prop("checked", true);
+	}else{
+	  $("input[name=del]").prop("checked", false);
+	}
+}
+
+
 /* pagination 페이지 링크 function */
 function goList(){
    	//document.searchForm.submit();
-	location.href = "/sym/log/clg/SelectLogMethodList.do";
+	location.href = "<c:url value='/sym/log/clg/SelectLogMethodList.do'/>";	
 }
 
 /* 등록시 값 확인 */
@@ -99,28 +190,45 @@ function fn_delete() {
 	}
 	
 }
+
+
 </script>
-<style>
-.del_file_btn{border: none;background-color: transparent;background-image: url(/direct/img/upload_delect_img.png);background-repeat: no-repeat;background-position: center center;vertical-align: middle;margin-top: -4px;margin-right: 15px;}
-.file_size{color: #0388d2;font-weight: bold;}
-.uploaded_obj{width: 100%;}
-</style>
 </head>
 <body>
+<noscript>자바스크립트를 지원하지 않는 브라우저에서는 일부 기능을 사용하실 수 없습니다.</noscript>
 <form name="writeForm" method="post">
 	<input type="hidden" name="del" value="${loginLog.admotId}" />
 	<input type="hidden" name="admotId" value="${loginLog.admotId}" />
-	<div class="contWrap">
+	
-		<div class="pageTitle">
+	
-			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
+
-			<h2 class="titType1 c_222222 fwBold">관리자로그설정관리</h2>
+	
-			<p class="tType6 c_999999">관리자 로그 설정을 관리 합니다.</p>
+		<div class="cont_wrap">
-		</div>
+			<div class="box">
-		<div class="pageCont">
+				<!-- cont_tit -->
-			<div class="listTop resisterList">
+				<div class="cont_tit">
-				<p class="right block fwMd"><span class="tType4 c_e40000 fwBold">*</span>는 필수입력 항목입니다.</p>
+					<h2>관리자로그설정관리상세</h2>
-			</div>
+					<ul class="cont_nav">
-			<table class="tbType2">
+						<li class="home"><a href="/"><i></i></a></li>
+						<li>
+							<p>운영관리</p>
+						</li>
+						<li><span>관리자로그설정관리</span></li>
+						<li><span class="cur_nav">상세화면</span></li>
+					</ul>
+				</div>
+				<!-- //cont_tit -->
+
+				<div class="cont">
+
+						
+						
+						
+				<!-- list -->
+				<div class="list tb_type01">
+				
+				
+				<table class="tbType2">
 				<colgroup>
 					<col style="width: 20%">
 					<col style="width: 80%">
@@ -138,6 +246,12 @@ function fn_delete() {
 							<input type="text" size="50" name="methodNm" value="${loginLog.methodNm}" title="methodNm" maxlength="100" />
 						</td>
 					</tr>
+					<tr>
+						<th><span class="reqArea">기능명</span></th>
+						<td colspan="3">
+							<input type="text" size="50" name="approNm" value="${loginLog.approNm}" title="approNm" maxlength="100" />
+						</td>
+					</tr>					
 					<tr>
 						<th><span class="reqArea">파라미터</span></th>
 						<td colspan="3">
@@ -147,9 +261,11 @@ function fn_delete() {
 						</td>
 					</tr>
 					<tr>
-						<th><span class="reqArea">기능명</span></th>
+						<th><span class="reqArea">privacy</span></th>
 						<td colspan="3">
-							<input name="approNm" value="${loginLog.approNm}" title="approNm" maxlength="100" />
+							<input type="text" size="50" name="privacy" value="${empty loginLog.admotId ? 'N' : loginLog.privacy }" title="privacy" maxlength="100" />
+							<br><span class="cfText">*기본값은 N 입니다.</span>
+							<br><span class="cfText c_ed4555">N / Y *개인정보 포함 여부를 표시합니다.</span>
 						</td>
 					</tr>
 					<c:if test="${!empty loginLog.admotId }">
@@ -173,8 +289,47 @@ function fn_delete() {
 				</c:if>
 				
 			</div>
-	 	</div>
+				
+								
+				
+				</div>
+				<!-- //list -->
+				
+				<!-- btn_wrap -->
+				 
+				<!-- btn_wrap -->
+				<div class="btn_wrap btn_layout01">
+					<div class="area_right">
+						<button type="button" class="btnType02"  onclick="fncDeleteGroupPolicy(); return false;">삭제</button>
+					</div>
+					<div class="area_right">
+						<button type="button" class="btnType02"  onclick="fncInsertLoginGroupPolicy(); return false;">등록</button>
+					</div>
+				</div>
+				<!-- //btn_wrap -->
+				
+				<!-- 페이지 네비게이션 시작 -->
+				<c:if test="${!empty logMethodList}">
+				<div class="page">
+					<ul class="inline">
+						<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+					</ul>
+				</div>
+				</c:if> 
+				<!-- //페이지 네비게이션 끝 -->
+			</div>
+		</div>
 	</div>
+	<!-- //cont -->
+
 </form>
+<!-- 
+<form name="searchForm" method="get" action="<c:url value='/sym/log/clg/SelectLoginLogList.do'/>">
+	<input name="pageIndex" type="hidden" value="1" />
+	<input name="searchCondition" type="hidden"   />
+	<input name="searchKeyword" type="hidden" />
+	<input name="searchConditionSite" type="hidden" />
+</form>
+ -->
 </body>
-</html>
+</html>

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);

src/main/webapp/WEB-INF/web.xml

@@ -116,7 +116,7 @@
     <session-config>
         <session-timeout>600</session-timeout>
         <cookie-config>
-	        <path>/offedu</path>
+	        <path>/offeduadvc</path>
     	</cookie-config>
     </session-config>