Merge branch 'tolag3'

메인화면 마무리

src/main/java/kcc/web/MainController.java

@@ -97,6 +97,7 @@ import kcc.let.sym.site.service.SiteManagerVO;
 import seed.com.gtm.board.CaseBoardService;
 import seed.com.gtm.exam.ExamBoardService;
 import seed.com.gtm.faqbbs.faqBpardService;
+import seed.utils.SeedConstants;
 
 /**
  * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스)
@@ -229,7 +230,7 @@ public class MainController {
 		/** 뉴스레터 */
 		model.addAttribute("faqList", this.faqList());
 		
-		List<Map<String,Object>> test = examList();
+		model.addAttribute("examList", this.examList());
 		
 		return "web/main/mainPage";
 	}
@@ -1364,17 +1365,17 @@ public class MainController {
 				.forEach(t -> {
 					String faqSetIdx = t.get("FAQ_SETIDX").toString();
 					//조정신청
-					if("101".equals(faqSetIdx)) {
+					if(SeedConstants.FAQ_JOJUNGSINCHUNG.equals(faqSetIdx)) {
 						t.put("bbsTypeNm", "조정신청");
 						t.put("bbsTypeUrl", "/web/user/faqBbs/case/101/147/faq101Detail.do?faqSeq="+ t.get("FAQ_SEQ_NUMBER").toString() +"&page=1&searchType=title&searchTilte=");
 					}
 					//절차진행
-					else if("102".equals(faqSetIdx)) {
+					else if(SeedConstants.FAQ_JULCHAJINHENG.equals(faqSetIdx)) {
 						t.put("bbsTypeNm", "절차진행");
 						t.put("bbsTypeUrl", "/web/user/faqBbs/case/102/148/faq102Detail.do?faqSeq="+ t.get("FAQ_SEQ_NUMBER").toString() +"&page=1&searchType=title&searchTilte=");
 					}
 					//절차종료
-					else if("103".equals(faqSetIdx)) {
+					else if(SeedConstants.FAQ_JULCHAJONGRYO.equals(faqSetIdx)) {
 						t.put("bbsTypeNm", "절차종료");
 						t.put("bbsTypeUrl", "/web/user/faqBbs/case/103/149/faq103Detail.do?faqSeq="+ t.get("FAQ_SEQ_NUMBER").toString() +"&page=1&searchType=title&searchTilte=");
 					}
@@ -1386,31 +1387,12 @@ public class MainController {
 	
 	
 	private List<Map<String,Object>> examList(){
-//		if(boardIdx.equals("402")){
-//			menuName = "공정거래";
-//		}else if(boardIdx.equals("403")){
-//			menuName = "가맹사업거래";
-//		}else if(boardIdx.equals("404")){
-//			menuName = "하도급거래";
-//		}else if(boardIdx.equals("405")){
-//			menuName = "대규모유통업거래";
-//		}else if(boardIdx.equals("406")){
-//			menuName = "불공정약관";
-//		}else if(boardIdx.equals("407")){
-//			menuName = "대리점거래";
-//		}
-//		Map<String,Object> paramMap = new HashMap<String, Object>();
-//		
-//		//페이징 관련
-//		paramMap.put("pageStart", 0);
-//		paramMap.put("perPageNum", 1);
-//		paramMap.put("boardIdx", "402");
-//		
-//		List<Map<String,Object>> bbsList = examBoardService.boardList(paramMap);
-		
-		
 		List<Map<String,Object>> bbsList = new ArrayList<>();
-		for(int i = 402 ; i < 408 ; i ++) {
+		for(
+				int i = Integer.valueOf(SeedConstants.EXAM_GONGJUNG) ;
+				i < Integer.valueOf(SeedConstants.EXAM_DAERIJUM)+1 ;
+				i ++
+			) {
 			Map<String,Object> paramMap = new HashMap<String, Object>();
 			
 			paramMap.put("pageStart", 0);
@@ -1425,23 +1407,29 @@ public class MainController {
 		
 		bbsList.stream().forEach(t -> {
 							String examId = t.get("EXAM_ID").toString();
-							
+							if(SeedConstants.EXAM_GONGJUNG.equals(examId)){
-							if("402".equals(examId)){
+							    t.put("menuNm", "공정거래");
-//								menuName = "공정거래";
+							    t.put("titleColor", "orange");
-							}else if("403".equals(examId)){
+							} else if(SeedConstants.EXAM_GAMENG.equals(examId)){
-//								menuName = "가맹사업거래";
+							    t.put("menuNm", "가맹사업거래");
-							}else if("404".equals(examId)){
+							    t.put("titleColor", "red");
-//								menuName = "하도급거래";
+							} else if(SeedConstants.EXAM_HADO.equals(examId)){
-							}else if("405".equals(examId)){
+							    t.put("menuNm", "하도급거래");
-//								menuName = "대규모유통업거래";
+							    t.put("titleColor", "yellow");
-							}else if("406".equals(examId)){
+							} else if(SeedConstants.EXAM_DAEGYUMO.equals(examId)){
-//								menuName = "불공정약관";
+							    t.put("menuNm", "대규모유통업거래");
-							}else if("407".equals(examId)){
+							    t.put("titleColor", "darkorange");
-//								menuName = "대리점거래";
+							} else if(SeedConstants.EXAM_BULGONGJUNG.equals(examId)){
+							    t.put("menuNm", "불공정약관");
+							    t.put("titleColor", "darkred");
+							} else if(SeedConstants.EXAM_DAERIJUM.equals(examId)){
+							    t.put("menuNm", "대리점거래");
+							    t.put("titleColor", "darkyellow");
+							}else {
+								t.put("menuNm", "공정거래");
+								t.put("titleColor", "orange");
 							}
 						});
-		
-		
 		return bbsList;
 	}
 	

src/main/java/seed/utils/SeedConstants.java

@@ -45,4 +45,47 @@ public class SeedConstants {
 	public static final String BUYEONGUWON								= "0914000000";	//부연구원
 	public static final String GWANRIJA									= "0915000000";	//관리자
 	public static final String DAERI									= "0916000000";	//대리
+	
+	
+	
+	/* 자주하는질문 게시판 유형 */
+	/**
+	 * 자주하는질문 - 조정신청
+	 */
+	public static final String FAQ_JOJUNGSINCHUNG						= "101";	// 자주하는질문 - 조정신청
+	/**
+	 * 자주하는질문 - 절차진행
+	 */
+	public static final String FAQ_JULCHAJINHENG						= "102";	// 자주하는질문 - 절차진행
+	/**
+	 * 자주하는질문 - 절차종료
+	 */
+	public static final String FAQ_JULCHAJONGRYO						= "103";	// 자주하는질문 - 절차종료
+	
+	
+	/* 조정사례 게시판 유형 */
+	/**
+	 * 조정사례 - 공정거래
+	 */
+	public static final String EXAM_GONGJUNG							= "402";	// 조정사례 - 공정거래	
+	/**
+	 * 조정사례 - 가맹사업거래	
+	 */
+	public static final String EXAM_GAMENG								= "403";	// 조정사례 - 가맹사업거래	
+	/**
+	 * 조정사례 - 하도급거래	
+	 */
+	public static final String EXAM_HADO								= "404";	// 조정사례 - 하도급거래	
+	/**
+	 * 조정사례 - 대규모유통업거래
+	 */
+	public static final String EXAM_DAEGYUMO							= "405";	// 조정사례 - 대규모유통업거래	
+	/**
+	 * 조정사례 - 불공정약관	
+	 */
+	public static final String EXAM_BULGONGJUNG							= "406";	// 조정사례 - 불공정약관	
+	/**
+	 * 조정사례 - 대리점거래	
+	 */
+	public static final String EXAM_DAERIJUM							= "407";	// 조정사례 - 대리점거래	
 }

src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp

@@ -1,6 +1,12 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
+<script type="text/javascript">
+	function moveUrl(){
+		location.href = $("#slct_site option:selected").val();
+	}
+</script>
+
 <footer class="footer">
 	<div class="inner">
 		<h1 class="logo">
@@ -14,20 +20,24 @@
 				<p><b class="gMarket_bold">FAX : 02-6363-9119</b></p>
 			</div>
 			<div class="footer_site">
-				<a href="/" target="_blank">기관소개 <i class="icon outlink"></i></a>
+				<a href="https://www.kofair.or.kr/home/content.do?menu_cd=000004" target="_blank">기관소개 <i class="icon outlink"></i></a>
 				<a href="#">오시는 길 <i class="icon arrow right"></i></a>
 				<div class="site_wrap">
-					<select name="" id="" title="관련사이트 선택">
+					<select id="slct_site" class="slct_site" title="관련사이트 선택">
 						<option value="">관련사이트 바로가기</option>
+						<option value="http://www.kofair.or.kr/goMain.do">공정거래조정원</option>
+		              	<option value="http://ftc.go.kr/">공정거래위원회</option>
+		              	<option value="https://www.data.go.kr/">국가지식정보통합검색시스템</option>
+		              <option value="http://groupopni.ftc.go.kr/">기업집단정보포탈</option>
 					</select>
-					<button type="button" title="관련사이트 이동" class="btn btn_text btn_40 gray_fill fw_bold">GO</button>
+					<button type="button" title="관련사이트 이동" class="btn btn_text btn_40 gray_fill fw_bold" onclick="moveUrl(); return false;">GO</button>
 				</div>
 			</div>
 		</div>
 		<div class="footer_bottom">
 			<div class="link">
-				<a href="#" class="fw_bold" target="_blank">개인정보처리방침 <i class="icon outlink"></i></a>
+				<a href="https://www.kofair.or.kr/home/content.do?menu_cd=000061" class="fw_bold" target="_blank">개인정보처리방침 <i class="icon outlink"></i></a>
-				<a href="#">이메일무단수집거부</a>
+				<a href="/">이메일무단수집거부</a>
 			</div>
 			<p class="copyright">Copyright KOFAIR. All Rights Reserved</p>
 		</div>

src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

@@ -130,13 +130,13 @@ function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) {
 	    </c:otherwise>
 	</c:choose>
 	
-	<div class="visual" style="
+<div class="visual" style="
-							    width: 100%;
+						    width: 100%;
-							    padding: 70px 0;
+						    padding: 70px 0;
-							    background: url('${backgroundUrl}') no-repeat center center;
+						    background: url('${backgroundUrl}') no-repeat center center;
-							    text-align: center;
+						    text-align: center;
-							    background-size: cover;
+						    background-size: cover;
-						    ">
+					    ">
 	<div class="inner">
 		<p class="visual_title">한국공정거래조정원 <span>분쟁조정사건처리시스템</span> 입니다.</p>
 
@@ -191,48 +191,17 @@ function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) {
 
 		<div class="case_list swiper">
 			<div class="swiper-wrapper">
-				<div class="swiper-slide">
+				<c:forEach var="caseList" items="${examList}" varStatus="status">
-					<a href="#" class="case">
+					<div class="swiper-slide">
-						<p class="case_type_box orange">공정거래</p>
+						<a href="#" class="case">
-						<p class="case_type">기타의 불이익제공-③ 기타 분쟁</p>
+							<p class="case_type_box ${caseList.titleColor}">
-						<p class="case_title">가구 제조업자의 거래상 지위 남용 관련 분쟁</p>
+								<c:out value="${caseList.menuNm}"/>
-					</a>
+							</p>
-				</div>
+							<p class="case_type"><c:out value="${caseList.EXAM_TYPE}"/></p>
-				<div class="swiper-slide">
+							<p class="case_title"><c:out value="${caseList.EXAM_SUBJ}"/></p>
-					<a href="#" class="case">
+						</a>
-						<p class="case_type_box red">가맹사업거래</p>
+					</div>
-						<p class="case_type">설계변경 등에 따른 하도급대금 조정의무</p>
+				</c:forEach>
-						<p class="case_title">(하도)(건설)(2024)토목건축공사업자의 설계변경 등에 따른 하도급대금의 조정 관련 분쟁에 대한 건</p>
-					</a>
-				</div>
-				<div class="swiper-slide">
-					<a href="#" class="case">
-						<p class="case_type_box yellow">하도급거래</p>
-						<p class="case_type">기타의 불이익제공-③ 기타 분쟁</p>
-						<p class="case_title">가구 제조업자의 거래상 지위 남용 관련 분쟁</p>
-					</a>
-				</div>
-				<div class="swiper-slide">
-					<a href="#" class="case">
-						<p class="case_type_box darkorange">대규모유통업거래</p>
-						<p class="case_type">기타의 불이익제공-③ 기타 분쟁</p>
-						<p class="case_title">가구 제조업자의 거래상 지위 남용 관련 분쟁</p>
-					</a>
-				</div>
-				<div class="swiper-slide">
-					<a href="#" class="case">
-						<p class="case_type_box darkred">불공정약관</p>
-						<p class="case_type">기타의 불이익제공-③ 기타 분쟁</p>
-						<p class="case_title">가구 제조업자의 거래상 지위 남용 관련 분쟁</p>
-					</a>
-				</div>
-				<div class="swiper-slide">
-					<a href="#" class="case">
-						<p class="case_type_box darkyellow">대리점거래</p>
-						<p class="case_type">기타의 불이익제공-③ 기타 분쟁</p>
-						<p class="case_title">가구 제조업자의 거래상 지위 남용 관련 분쟁</p>
-					</a>
-				</div>
 			</div>
 		</div>
 	</div>
@@ -311,9 +280,9 @@ function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) {
 		</c:choose>
 		
 		<div class="callcenter_content" style="
-												    width: 342px;
+											    width: 342px;
-												    background: #d4c9fe url('${popupzonedUrl}') no-repeat center bottom;
+											    background: #d4c9fe url('${popupzonedUrl}') no-repeat center bottom;
-												    border-radius: 10px;
+											    border-radius: 10px;
 												">
 			<a href="#">
 				<p class="title">분쟁조정 콜센터</p>