Merge branch 'JIWOO' into advc

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

@@ -114,6 +114,10 @@ public class SchduleManageVO extends ComDefaultVO  {
     private String trgt;			//대상
     private String prsnl;			//인원
     private String instrNm;			//강사이름
+    private String isltnScholYn;	//도시벽지 여부
+    private String divCd;			//청소년 교육 구분
+    private String eduPlace;		//교육장소
+    private String prcsNm;			//온라인콘텐츠 신청 항목
     
     
     
@@ -446,5 +450,38 @@ public class SchduleManageVO extends ComDefaultVO  {
 		this.instrNm = instrNm;
 	}
 
+	public String getIsltnScholYn() {
+		return isltnScholYn;
+	}
+
+	public void setIsltnScholYn(String isltnScholYn) {
+		this.isltnScholYn = isltnScholYn;
+	}
+
+	public String getDivCd() {
+		return divCd;
+	}
+
+	public void setDivCd(String divCd) {
+		this.divCd = divCd;
+	}
+
+	public String getEduPlace() {
+		return eduPlace;
+	}
+
+	public void setEduPlace(String eduPlace) {
+		this.eduPlace = eduPlace;
+	}
+
+	public String getPrcsNm() {
+		return prcsNm;
+	}
+
+	public void setPrcsNm(String prcsNm) {
+		this.prcsNm = prcsNm;
+	}
+
+	
 	
 }

src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java

@@ -676,28 +676,68 @@ public class EduAplctMngTngrController {
     	schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", ""));
     	
     	List<SchduleManageVO> list= schduleManageService.selectSchManageStatusList(schduleManageVO);
+    	list = egovCryptoUtil.decryptSchduleManageVOList(list);
     	
 		List<Object> excelData  = new ArrayList<>();
 		excelData.addAll(list);
 		// 세팅값
 		String title = "청소년 찾아가는 저작권 교육 - 교육일정";
 		int[] width = {
-			4000
+				8000
 				, 4000
 				, 4000
+				, 4000
+				, 4000
+				, 12000
+				, 4000
+				, 4000
+				, 4000
+				, 6000
+				, 4000
+				, 4000
+				, 4000
+				, 4000
+				, 4000
+				, 12000
 			}; // 너비
 			
 			String[] header = {
-			"교육일자"
+				"교육일시"
+				, "교육구분"
 				, "학교(기관)명"
-			, "교육시간"
+				, "학교구분"
+				, "도시벽지학교여부"
+				, "주소"
+				, "담당자"
+				, "휴대폰"
+				, "전화"
+				, "이메일"
+				, "강사"
+				, "구분"
+				, "교육장소"
+				, "대상"
+				, "인원"
+				, "온라인콘텐츠 신청 항목"
 			};
 			
 			//VO name과 일치 시킨다.
 			String[] order = {
-			"DateTxt"
+				"EduDate"
+				, "EduSlctCd"
 				, "Title"
-			, "TimeTxt"
+				, "InsttDivCd"
+				, "IsltnScholYn"
+				, "AddrDetail"
+				, "ChrgNm"
+				, "Clphone"
+				, "Phone"
+				, "Email"
+				, "InstrNm"
+				, "DivCd"
+				, "EduPlace"
+				, "Trgt"
+				, "Prsnl"
+				, "PrcsNm"
 			};
 
 		// 호출

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

@@ -82,6 +82,13 @@
 			, aa.trgt
 			, aa.prsnl
 			, aa.instrNm
+			
+			, IF(aa.isltnScholYn = 'Y', '예', '아니오') AS isltnScholYn
+			, aa.eduPlace
+			<isEqual property="lctrDivCd" compareValue="10">
+				, aa.divCd
+				, aa.prcsNm
+			</isEqual>
 		FROM(			
 		SELECT   
 		
@@ -116,7 +123,13 @@
 		         a.RQST_CN rqstCn,
 		         b.trgt trgt,
 		         b.prsnl prsnl,
-		         f.instr_nm instrNm
+		         f.instr_nm instrNm,
+		         a.isltn_schol_yn isltnScholYn,
+		         a.edu_place eduPlace
+		         <isEqual property="lctrDivCd" compareValue="10">
+			         ,g.code_nm divCd,
+			         h.prcs_nm prcsNm
+		         </isEqual>
 		
 		FROM ve_edu_aplct a
 			, ve_edu_chasi b
@@ -124,6 +137,10 @@
 			, lettccmmndetailcode d
 			, ve_edu_chasi_instr_asgnm e
 			, ve_instr_detail f
+			<isEqual property="lctrDivCd" compareValue="10">
+				, lettccmmndetailcode g
+				, ve_prcs h
+			</isEqual>
 		WHERE 1=1
 			AND IFNULL(A.USE_YN, 'Y') != 'N'			
 		<isNotEmpty property="aprvlCd">
@@ -142,12 +159,26 @@
 		</isNotEmpty>					
 			AND c.code_id = 'VE0007'
 			AND c.code = a.edu_slct_cd
+			<isNotEmpty property="lctrDivCd">
+				<isEqual property="lctrDivCd" compareValue="10">
+					AND d.code_id = 'VE0009'
+					AND d.code = a.schol_div_cd
+				</isEqual>
+				<isEqual property="lctrDivCd" compareValue="20">
 					AND d.code_id = 'VE0012'
 					AND d.code = a.instt_div_cd
+				</isEqual>
+			</isNotEmpty>
 			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#
+			<isEqual property="lctrDivCd" compareValue="10">
+				AND g.code_id = 'VE0010'
+				AND g.code = b.div_cd
+				AND h.use_Yn = 'Y'
+				AND h.prcs_ord = a.edu_cn
+			</isEqual>
 			)aa
 		ORDER BY START	
 	</select>

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

@@ -211,19 +211,13 @@
 							<th scope="row">
 								<p>대상</p>
 							</th>
-							<td><c:out value="${chasi.trgt}" /></td>
+							<td colspan="3"><c:out value="${chasi.trgt}" /></td>
 						</tr>
 						<tr>
 							<th scope="row">
 								<p>인원</p>
 							</th>
 							<td><c:out value="${chasi.prsnl}" /></td>
-							<th scope="row">
-								<p>구분</p>
-							</th>
-							<td>
-								<kc:code codeId="VE0010" code="${chasi.divCd}"/>
-							</td>
 						</tr>						
 						
 						</c:if>