diff --git a/src/main/java/seed/com/gtm/base/BaseController.java b/src/main/java/seed/com/gtm/base/BaseController.java index f187078d..e90bf480 100644 --- a/src/main/java/seed/com/gtm/base/BaseController.java +++ b/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 받아오기 diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml index 6dff51e5..bd084d2a 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml +++ b/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 + + + + + AND A.CASE_GUBUN = #{caseGubunType} + AND A.MEDIATION_BIG IN('0619010000', '0620010000', '0621010000', '0622010000', '0604010000', '0605010000', '0624010000','0625010000','0626010000') @@ -100,7 +106,7 @@ AND A.CASE_NO LIKE '%' || #{searchVal} || '%' AND E.CONFERENCE_NAMES LIKE '%' || #{searchVal} || '%' 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} || '%') - 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} || '%') + 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} || '%') AND A.CASE_EXAMINER IN (SELECT MEMBER_ID FROM T_MEMBER WHERE MEMBER_NAME LIKE '%' || #{searchVal} || '%') @@ -142,6 +148,10 @@ AND A.DEL_YN = 'N' AND A.CASE_END = 'Y' AND SUBSTR(A.CASE_NO,3,4) >= 2017 + + AND A.CASE_GUBUN = #{caseGubunType} + + AND C.TIMHDER_ASSIGN IN('1004000000','1005000000','1006000000','1007000000','1008000000','1009000000') @@ -155,6 +165,7 @@ + AND A.MEDIATION_BIG IN('0619010000', '0620010000', '0621010000', '0622010000', '0604010000', '0605010000') diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendList.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendList.jsp index 4c7a5442..a9692fb9 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendList.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublend/trublendList.jsp @@ -44,6 +44,13 @@
+ +