diff --git a/.gitignore b/.gitignore
index 35aa4a6a..937f245f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,14 @@ rebel.xml
#Mac OS
.DS_Store
+/src/main/java/kcc/web/.editorconfig
+/.smarttomcat/ipedu/conf/catalina.policy
+/.smarttomcat/ipedu/conf/catalina.properties
+/.smarttomcat/ipedu/conf/context.xml
+/.smarttomcat/ipedu/conf/jaspic-providers.xml
+/.smarttomcat/ipedu/conf/jaspic-providers.xsd
+/.smarttomcat/ipedu/conf/logging.properties
+/.smarttomcat/ipedu/conf/server.xml
+/.smarttomcat/ipedu/conf/tomcat-users.xml
+/.smarttomcat/ipedu/conf/tomcat-users.xsd
+/.smarttomcat/ipedu/conf/web.xml
diff --git a/pom.xml b/pom.xml
index a2561020..5bf3eab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,6 +659,20 @@
maven-javadoc-plugin
2.9.1
+
+ org.zeroturnaround
+ jrebel-maven-plugin
+ 1.2.1
+
+
+ generate-rebel-xml
+ process-resources
+
+ generate
+
+
+
+
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
index 461086fa..d1bd4673 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
@@ -223,7 +223,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
* 라인 배경컬러
*/
private String color;
-
+
/*
private String ddlnCd; //교육과정상태 - VEA004
private String aprvlCd; //교육신청상태 - VE0003
@@ -1127,5 +1127,5 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) {
this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList;
}
-
+
}
diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java
index 5d0016c5..9e0cd99d 100644
--- a/src/main/java/kcc/web/MainController.java
+++ b/src/main/java/kcc/web/MainController.java
@@ -4,6 +4,8 @@ import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -14,6 +16,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
+import java.util.stream.Collectors;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -35,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import kcc.com.cmm.util.StringUtil;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.springframework.beans.factory.annotation.Value;
@@ -397,11 +401,11 @@ public class MainController {
/** 팝업 알림창괸리 */
model.addAttribute("popupList", popupList());
-
+
/** 팝업존 알림창괸리 */
model.addAttribute("popupzoneList", popupzoneList());
-
- /** 게시판 조회 - 공지사항 */
+
+ /** 게시판 조회 - 공지사항 */
Map noticeBbsList = noticeBbsList();
model.addAttribute("noticeBbsList", noticeBbsList.get("noticeBbsList"));
model.addAttribute("noticeBbsUrl", noticeBbsList.get("noticeBbsUrl"));
@@ -412,8 +416,12 @@ public class MainController {
model.addAttribute("atchBbsUrl", atchBbsList.get("atchBbsUrl"));
/** 주요 교육일정 */
- List eduAplctList = eduAplctList();
-
+ Map> eduAplctList = eduAplctList();
+ model.addAttribute("eduAplctList", eduAplctList.get("eduAplctList"));
+ model.addAttribute("sspnIdtmtList", eduAplctList.get("sspnIdtmtList"));
+ model.addAttribute("cmdTrgtList", eduAplctList.get("cmdTrgtList"));
+ model.addAttribute("preventList", eduAplctList.get("preventList"));
+
}catch(Exception ex) {
ex.printStackTrace();
System.out.println(ex.getMessage());
@@ -2102,7 +2110,7 @@ public class MainController {
return returnMap;
}
- private List eduAplctList() throws Exception{
+ private Map> eduAplctList() throws Exception{
VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();
@@ -2131,8 +2139,15 @@ public class MainController {
vEPrcsDetailVO.setUseYn("Y"); //공개 여부만 조회
List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectMainContent();
-
- return vEPrcsDetailVOList;
+
+ Map> returnMap = new HashMap>();
+
+ returnMap.put("eduAplctList", vEPrcsDetailVOList.stream().limit(Math.min(vEPrcsDetailVOList.size(), 4)).collect(Collectors.toList()));
+ returnMap.put("sspnIdtmtList", vEPrcsDetailVOList.stream().filter(t -> "60".equals(t.getLctrDivCd())).collect(Collectors.toList()));
+ returnMap.put("cmdTrgtList", vEPrcsDetailVOList.stream().filter(t -> "70".equals(t.getLctrDivCd())).collect(Collectors.toList()));
+ returnMap.put("preventList", vEPrcsDetailVOList.stream().filter(t -> "80".equals(t.getLctrDivCd())).collect(Collectors.toList()));
+
+ return returnMap;
}
}
\ No newline at end of file
diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
index 3361c86a..8661d8d7 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
@@ -921,6 +921,28 @@
a.rmrks AS rmrks,
a.memo AS memo,
a.sig_memo AS sigMemo
+
+ , a.rep_qf AS repQf
+ , a.sub_qf AS subQf
+ , a.work_area AS workArea
+ , a.lct_avl_area_1 AS lctAvlArea1
+ , a.lct_avl_area_2 AS lctAvlArea2
+ , a.lct_avl_area_3 AS lctAvlArea3
+ , a.lct_avl_area_4 AS lctAvlArea4
+ , a.lct_avl_area_5 AS lctAvlArea5
+ , a.lct_avl_area_6 AS lctAvlArea6
+
+ , a.avl_lct_cntnt_1 AS avlLctCntnt1
+ , a.avl_lct_cntnt_2 AS avlLctCntnt2
+ , a.avl_lct_cntnt_3 AS avlLctCntnt3
+
+ , a.gender AS gender
+ , a.rcrt_ctgr AS rcrtCtgr
+ , a.apnt_dt AS apntDt
+ , a.actv_dt AS actvDt
+ , a.ovrl_srvy AS ovrlSrvy
+
+ , a.carer AS carer
FROM
ve_instr b
, ve_instr_detail a
diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index 330bc748..25617367 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -213,7 +213,34 @@ function fn_egov_inqire_notice(bbsId, nttId) {
--%>