Merge branch 'JIWOO' into advc

src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java

@@ -98,6 +98,7 @@ public class SchduleManageVO extends ComDefaultVO  {
     private Date todate;
    
     //23.07.26 엑셀 다운로드 항목 추가
+    private String eduDate;			//교육일시
     private String eduSlctCd;		//교육구분
     private String insttDivCd;		//기관구분
     private String eduMd;			//교육매체
@@ -110,6 +111,9 @@ public class SchduleManageVO extends ComDefaultVO  {
     private String email;			//이메일
     private String hopeSbjct;		//희망주제
     private String rqstCn;			//교육 주제 관련 상세 요청사항 및 사전 질의
+    private String trgt;			//대상
+    private String prsnl;			//인원
+    private String instrNm;			//강사이름
     
     
     
@@ -409,6 +413,38 @@ public class SchduleManageVO extends ComDefaultVO  {
 	public void setRqstCn(String rqstCn) {
 		this.rqstCn = rqstCn;
 	}
+
+	public String getEduDate() {
+		return eduDate;
+	}
+
+	public void setEduDate(String eduDate) {
+		this.eduDate = eduDate;
+	}
+
+	public String getTrgt() {
+		return trgt;
+	}
+
+	public void setTrgt(String trgt) {
+		this.trgt = trgt;
+	}
+
+	public String getPrsnl() {
+		return prsnl;
+	}
+
+	public void setPrsnl(String prsnl) {
+		this.prsnl = prsnl;
+	}
+
+	public String getInstrNm() {
+		return instrNm;
+	}
+
+	public void setInstrNm(String instrNm) {
+		this.instrNm = instrNm;
+	}
 	
 	
 }

src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java

@@ -477,6 +477,7 @@ public class EgovCryptoUtil {
 		if (!"".equals(p_schduleManageVO.getClphone())) p_schduleManageVO.setClphone(this.decrypt(p_schduleManageVO.getClphone()));		
 		if (!"".equals(p_schduleManageVO.getPhone())) p_schduleManageVO.setPhone(this.decrypt(p_schduleManageVO.getPhone()));		
 		if (!"".equals(p_schduleManageVO.getEmail())) p_schduleManageVO.setEmail(this.decrypt(p_schduleManageVO.getEmail()));
+		if (!"".equals(p_schduleManageVO.getInstrNm())) p_schduleManageVO.setInstrNm(this.decrypt(p_schduleManageVO.getInstrNm()));
 		return p_schduleManageVO;
 	}
 	

src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java

@@ -287,7 +287,7 @@ public class EduAplctMngAdultController {
 		//사용자 교육신청 차시 리스트
 		VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
 		vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
-
+		vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20);
 		List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
 
 		model.addAttribute("chasiList", vEEduChasiVOList);
@@ -499,7 +499,7 @@ public class EduAplctMngAdultController {
 		// 세팅값
 		String title = "성인 찾아가는 저작권 교육 - 교육일정";
 		int[] width = {
-			4000
+			8000
 			, 4000
 			, 4000
 			, 4000
@@ -510,29 +510,35 @@ public class EduAplctMngAdultController {
 			, 4000
 			, 4000
 			, 6000
+			, 4000
+			, 4000
+			, 4000
 			, 8000
 			, 12000
 		}; // 너비
 		
 		String[] header = {
-			"교육일자"
+			"교육일시"
 			, "교육구분"
 			, "기관(단체)명"
 			, "기관구분"
 			, "교육매체"
-			, "장소"
+			, "주소"
 			, "담당자"
 			, "직함"
 			, "휴대폰"
 			, "전화"
 			, "이메일"
+			, "강사"
+			, "대상"
+			, "인원"
 			, "희망주제"
 			, "교육 주제 관련 상세 요청사항"
 		};
 		
 		//VO name과 일치 시킨다.
 		String[] order = {
-			"DateTxt"
+			"EduDate"
 			, "EduSlctCd"
 			, "Title"
 			, "InsttDivCd"
@@ -543,6 +549,9 @@ public class EduAplctMngAdultController {
 			, "Clphone"
 			, "Phone"
 			, "Email"
+			, "InstrNm"
+			, "Trgt"
+			, "Prsnl"
 			, "HopeSbjct"
 			, "RqstCn"
 		};

src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Mysql.xml

@@ -65,6 +65,7 @@
 			, to_char(   TO_DATETIME(CONCAT(aa.edu_hope_dt, aa.strt_tm),'YYYYMMDDHH24MI'),    'YYYY-MM-DD HH24:MI:SS'  ) AS "start" 	 
 			, to_char(   TO_DATETIME(CONCAT(aa.edu_hope_dt, aa.strt_tm),'YYYYMMDDHH24MI'),    'YYYY-MM-DD'  ) AS dateTxt
 			, to_char(   TO_DATETIME(CONCAT(aa.edu_hope_dt, aa.strt_tm),'YYYYMMDDHH24MI'),    'HH24:MI:SS'  ) AS timeTxt
+			, CONCAT(TO_CHAR( TO_DATETIME(CONCAT(aa.edu_hope_dt, aa.strt_tm),'YYYYMMDDHH24MI'), 'YYYY-MM-DD HH24:MI' ), '~',TO_CHAR( TO_DATETIME(CONCAT(aa.edu_hope_dt, AA.END_tm),'YYYYMMDDHH24MI'), 'HH24:MI' )) AS eduDate
 			, aa.url
 			, aa.allDay
 			, aa.eduSlctCd
@@ -78,6 +79,9 @@
 			, aa.email
 			, aa.hopeSbjct
 			, aa.rqstCn
+			, aa.trgt
+			, aa.prsnl
+			, aa.instrNm
 		FROM(			
 		SELECT   
 		
@@ -109,12 +113,17 @@
 		         a.PHONE phone,
 		         a.EMAIL email,
 		         a.HOPE_SBJCT hopeSbjct,
-		         a.RQST_CN rqstCn
+		         a.RQST_CN rqstCn,
+		         b.trgt trgt,
+		         b.prsnl prsnl,
+		         f.instr_nm instrNm
 		
 		FROM ve_edu_aplct a
 			, ve_edu_chasi b
 			, lettccmmndetailcode c
 			, lettccmmndetailcode d
+			, ve_edu_chasi_instr_asgnm e
+			, ve_instr_detail f
 		WHERE 1=1
 			AND IFNULL(A.USE_YN, 'Y') != 'N'			
 		<isNotEmpty property="aprvlCd">
@@ -135,7 +144,10 @@
 			AND c.code = a.edu_slct_cd
 			AND d.code_id = 'VE0012'
 			AND d.code = a.instt_div_cd
-			
+			AND e.EDU_CHASI_ORD = b.EDU_CHASI_ORD
+			AND f.user_id = e.user_id
+			AND f.use_yn = 'Y'
+			AND f.instr_div = #lctrDivCd#
 			)aa
 		ORDER BY START	
 	</select>