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

src/main/java/seed/com/gtm/base/BaseController.java

@@ -205,6 +205,14 @@ public class BaseController {
 		if("L".equals(type)){
 			//mav.addObject("data", bservice.list(params));
 			params.put("data", JSPUtil.fixNull(bservice.list(params)));
+			
+			// 분쟁조정관리 > 종료사건 조회 
+			if(pageAction.equals("TrublendPagingList")) {
+				params.put("codeIdxs", "0200000000");	//사건진행상태
+				params.put("sql", "commonCaseGubunAll");	//사건 정보
+				params.put("caseGubunList", JSPUtil.fixNull(bservice.list(params)));
+			}
+			
 		}else if("S".equals(type)){
 			
 			//기안자 GW ID 받아오기

src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml

@@ -67,6 +67,8 @@
 		AND A.DEL_YN = 'N'
 		AND A.CASE_END = 'Y'
 		AND SUBSTR(A.CASE_NO,3,4) >= 2017
+		
+		<!--  
 		<if test='memberPosition eq "0910000000"'>
 			AND C.TIMHDER_ASSIGN IN('1004000000','1005000000','1006000000','1007000000','1008000000','1009000000','1030000000')
 		</if>
@@ -80,7 +82,11 @@
 				</otherwise>
 			</choose>
 		</if>
-
+		-->
+		
+		<if test="caseGubunType != null and caseGubunType != ''">
+			AND A.CASE_GUBUN = #{caseGubunType}
+		</if>
 		<if test="mediationBigType != null and mediationBigType != ''">
 			<choose>
 				<when test="mediationBigType == 'big1'">AND A.MEDIATION_BIG IN('0619010000', '0620010000', '0621010000', '0622010000', '0604010000', '0605010000', '0624010000','0625010000','0626010000')</when>
@@ -100,7 +106,7 @@
 				<when test="searchType == 'caseNoSearch'">AND A.CASE_NO LIKE '%' || #{searchVal} || '%' </when>
 				<when test="searchType == 'cfrncSearch'">AND E.CONFERENCE_NAMES LIKE '%' || #{searchVal} || '%' </when>
 				<when test="searchType == 'companyCeo'">AND A.CASE_NO IN (SELECT CASE_NO FROM C_CASEAPPLCNT WHERE APPLCNT_COMPANY LIKE '%' || #{searchVal} || '%') OR A.CASE_NO IN (SELECT CASE_NO FROM C_CASEAPPLCNT WHERE COMPANY_CEO LIKE '%' || #{searchVal} || '%')</when>
-				<when test="searchType == 'respondentCeo'">AND (A.CASE_NO IN (SELECT CASE_NO FROM C_CASERESPONDENT WHERE RESPONDENT_COMPANY LIKE '%' || #{searchVal} || '%') OR A.CASE_NO IN (SELECT CASE_NO FROM C_CASERESPONDENT WHERE RESPONDENT_CEO LIKE '%' || #{searchVal} || '%')</when>
+				<when test="searchType == 'respondentCeo'">AND A.CASE_NO IN (SELECT CASE_NO FROM C_CASERESPONDENT WHERE RESPONDENT_COMPANY LIKE '%' || #{searchVal} || '%') OR A.CASE_NO IN (SELECT CASE_NO FROM C_CASERESPONDENT WHERE RESPONDENT_CEO LIKE '%' || #{searchVal} || '%')</when>
 				<when test="searchType == 'examiner'">AND A.CASE_EXAMINER IN (SELECT MEMBER_ID FROM T_MEMBER WHERE MEMBER_NAME LIKE '%' || #{searchVal} || '%')</when>
 			</choose>
 		</if>
@@ -142,6 +148,10 @@
 		AND A.DEL_YN = 'N'
 		AND A.CASE_END = 'Y'
 		AND SUBSTR(A.CASE_NO,3,4) >= 2017
+		<if test="caseGubunType != null and caseGubunType != ''">
+			AND A.CASE_GUBUN = #{caseGubunType}
+		</if>
+		
 		<if test='memberPosition eq "0910000000"'>
 			AND C.TIMHDER_ASSIGN IN('1004000000','1005000000','1006000000','1007000000','1008000000','1009000000')
 		</if>
@@ -155,6 +165,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		
 		<if test="mediationBigType != null and mediationBigType != ''">
 			<choose>
 				<when test="mediationBigType == 'big1'">AND A.MEDIATION_BIG IN('0619010000', '0620010000', '0621010000', '0622010000', '0604010000', '0605010000')</when>

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendList.jsp

@@ -44,6 +44,13 @@
 				
 				<div class="sch-content-wrap clear">
 					<fieldset>
+						<select name="caseGubunType" id="caseGubunType" class="sch-select" title="거래유형 선택">
+							<option value="">거래유형 선택</option>
+							<c:forEach items="${caseGubunList}" var="caseGubunList" varStatus="status">
+								<option value="${caseGubunList.codeIdxs}" <c:if test="${caseGubunType == caseGubunList.codeIdxs}">selected="selected"</c:if>>${caseGubunList.codeName}</option>
+							</c:forEach>
+						</select>
+						
 						<select name="mediationBigType" id="mediationBigType" class="sch-select" onchange="mediationSmall()">
 							<option value="">대분류 선택</option>
 							<option value="big1"<c:if test="${mediationBigType == 'big1'}">selected="selected"</c:if>>불성립</option>