From 66d8b7465d68067aa4a49d77130e9282de4c8319 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Wed, 6 Mar 2024 11:24:22 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-06=2011:24=20=EC=B2=B4=ED=97=98?=
 =?UTF-8?q?=EA=B5=90=EC=8B=A4=20excel=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgnmInfo/service/VEEduExcelVO.java       | 29 +++++++++++++++++++
 .../web/OprtnAplctMngController.java          | 18 ++++++++++--
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml    | 21 ++++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java
index 7e0c7fc9..2baf3a9d 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduExcelVO.java
@@ -136,6 +136,11 @@ public class VEEduExcelVO {
 		
 		private String	chrgSexCd;				// 성별코드
 		
+		private String	isltnYn;			//도서학교여부
+		private String	isltn2Yn;			//벽지학교여부
+		private String	isltn3Yn;			//접적학교여부
+		private String	ppltnReducAreaYn;	//인구감소지역여부
+		
 		public String getInstrDiv() {
 			return instrDiv;
 		}
@@ -774,4 +779,28 @@ public class VEEduExcelVO {
 		public void setUserIdNum(String userIdNum) {
 			this.userIdNum = userIdNum;
 		}
+		public String getIsltnYn() {
+			return isltnYn;
+		}
+		public void setIsltnYn(String isltnYn) {
+			this.isltnYn = isltnYn;
+		}
+		public String getIsltn2Yn() {
+			return isltn2Yn;
+		}
+		public void setIsltn2Yn(String isltn2Yn) {
+			this.isltn2Yn = isltn2Yn;
+		}
+		public String getIsltn3Yn() {
+			return isltn3Yn;
+		}
+		public void setIsltn3Yn(String isltn3Yn) {
+			this.isltn3Yn = isltn3Yn;
+		}
+		public String getPpltnReducAreaYn() {
+			return ppltnReducAreaYn;
+		}
+		public void setPpltnReducAreaYn(String ppltnReducAreaYn) {
+			this.ppltnReducAreaYn = ppltnReducAreaYn;
+		}
 }
diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
index 1400ee12..e11a1e69 100644
--- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
@@ -442,13 +442,17 @@ public class OprtnAplctMngController {
 		List<VEEduExcelVO> list = vEEduMIXService.selectOprtnExcelList(vEEduAplctVO);
 		list = egovCryptoUtil.decryptVEEduExcelVOList(list);
 		
+		System.out.println("list.get(0).getIsltnYn()");
+		System.out.println(list.get(0).getIsltnYn());
 		List<Object> excelData  = new ArrayList<>();
 		excelData.addAll(list);
 		// 세팅값
 		String title = "저작권 체험교실 운영 신청 접수 목록";
 		int[] width = {1500, 4000, 2000, 2000, 4000, 4000, 4000, 4000, 4000, 2000, 10000
 			, 3000, 3000, 4000, 4000, 4000, 4000, 4000, 4000, 8000
-			, 4000, 3000, 4000
+			, 4000, 3000
+			, 2000, 2000, 2000, 2000
+			
 		}; // 너비
 		
 String[] header = {
@@ -478,7 +482,10 @@ String[] header = {
 
 ,"처리상태"
 ,"성별"
-,"참고사항"
+,"도서지역"
+,"벽지지역"
+,"접적지역"
+,"인구감소지역"
 };
 
 String[] order = {
@@ -508,7 +515,12 @@ String[] order = {
 
 ,"AprvlCd"
 ,"ChrgSexCd"
-,""
+
+,"IsltnYn"
+,"Isltn2Yn"
+,"Isltn3Yn"
+,"PpltnReducAreaYn"
+
 };
 
 		// 호출
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 36a7745d..c4ce390c 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -6269,6 +6269,7 @@
 				 AS oprtnStrtDt
 			, A.MDFY_RQST_YN					AS mdfyRqstYn
 			, DECODE(E.chrg_sex_cd, 'M', '남성', 'F', '여성') AS chrgSexCd
+			
 			, DECODE(A.aprvl_cd,
 					'10',
 					'운영신청',
@@ -6292,6 +6293,11 @@
 					'검토중',
 					'80',
 					'운영종료') AS aprvlCd
+			, NVL(f.isltn_yn,'N')	AS	isltnYn
+			, NVL(f.isltn2_yn,'N')	AS	isltn2Yn
+			, NVL(f.isltn3_yn,'N')	AS	isltn3Yn
+			, NVL(f.ppltn_reduc_area_yn,'N')	AS	ppltnReducAreaYn
+			
 		FROM
 			VE_EDU_APLCT A
 			LEFT OUTER JOIN
@@ -6335,6 +6341,21 @@
 			ON A.USER_ID = D.USER_ID
 			LEFT OUTER JOIN VE_EDU_OPRTN E
 			ON A.EDU_APLCT_ORD = E.EDU_APLCT_ORD
+			
+			LEFT OUTER JOIN (
+			
+					SELECT b.*
+					FROM (
+							SELECT STNDRD_SCHOL_CD, max(schol_id) schol_id
+							FROM ve_schol
+							GROUP BY STNDRD_SCHOL_CD 
+							) a
+							, ve_schol b
+					WHERE a.schol_id=b.schol_id	
+			
+			) f ON
+			A.stndrd_schol_cd=f.STNDRD_SCHOL_CD			
+			
 		WHERE NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
 			AND A.SBMT_YN                = 'Y'
 			AND A.LCTR_DIV_CD = #lctrDivCd#