Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml

@@ -31,7 +31,8 @@
           (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.CASE_GUBUN) AS CASE_GUBUN,
           (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = A.EXAMINER_ASSIGN) AS MEMBER_NAME,
           DEL_GUBUN,
-          (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.DOC_GUBUN) AS DOC_GUBUN
+          (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.DOC_GUBUN) AS DOC_GUBUN,
+          A.CASE_DATE AS CASE_DATE
       FROM C_RCEPTMST A
       <where>
       REQUEST_CHECK = '1602000000'

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep02.jsp

@@ -18,9 +18,21 @@
 		var isInfoAgree01YChecked = $('#infoAgree01_Y').is(':checked');
         var isInfoAgree02YChecked = $('#infoAgree02_Y').is(':checked');
         var isInfoAgree03YChecked = $('#infoAgree03_Y').is(':checked');
+        var isInfoAgree03Checked = $('input[name="infoAgree03"]:checked').length > 0;
+        
+        /* 250120 - 요청으로 인하여 뉴스레터 동의or비동의 체크 필수 */
+        if(!isInfoAgree03Checked){
+			alert("마케팅 및 광고활용 동의 또는 동의안함을 선택해 주세요.");
+            return false;
+        }
+        
         if (isInfoAgree03YChecked) {
         	$("#emailAgree").val("Y");
+        }else{
+        	$("#emailAgree").val("N");
         }
+        
+        
         if (isInfoAgree01YChecked && isInfoAgree02YChecked) {
         	$("#personalCheck").val("Y");
 			document.frm.submit();

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWritePop.jsp

@@ -316,10 +316,10 @@
 							<div class="sch-content-wrap clear">
 								<fieldset>
 									<select name="searchType" id="searchType" class="sch-select" title="자료유형 선택">
+										<option value="caseGubunName" <c:if test="${searchType == 'caseGubunName'}">selected="selected"</c:if>>협의회</option>
 										<option value="memberCompany" <c:if test="${searchType == 'memberCompany'}">selected="selected"</c:if>>소속</option>
 										<option value="memberPosit" <c:if test="${searchType == 'memberPosit'}">selected="selected"</c:if>>직책</option>
 										<option value="memberName" <c:if test="${searchType == 'memberName'}">selected="selected"</c:if>>이름</option>
-										<option value="caseGubunName" <c:if test="${searchType == 'caseGubunName'}">selected="selected"</c:if>>협의회</option>
 										<option value="caseFieldName" <c:if test="${searchType == 'caseFieldName'}">selected="selected"</c:if>>분야</option>
 									</select>
 									<input type="text" id="searchVal" name="searchVal" value="${searchVal}" class="sch-text" title="검색">

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administList.jsp

@@ -301,7 +301,7 @@
 						<th scope="col" rowspan="2">접수구분</th>
 						<th scope="col" colspan="2">신청인</th>
 						<th scope="col" colspan="2">피신청인</th>
-						<th scope="col" rowspan="2">등록일</th>
+						<th scope="col" rowspan="2">접수일</th>
 						<th scope="col" rowspan="2">분쟁유형</th>
 						<!--소속 : 유통팀, 한국공정거래조정원, 민원상담센터 -->
 						<c:if
@@ -353,7 +353,7 @@
 							<td>${list.applcntCompany}</td>
 							<td>${list.respondentCeo}</td>
 							<td>${list.respondentCompany}</td>
-							<td>${list.regDt}</td>
+							<td>${list.caseDate}</td>
 							<td>${list.caseGubun}</td>
 							<c:if
 								test="${(memberDept == SeedConstants.YUTONG || memberDept == SeedConstants.HANGUK || memberDept == SeedConstants.MINWON || memberPosition == SeedConstants.GWANRIJA) }">