diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java index 88abc9f9..d39b5e88 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/service/ConciliatorManageVO.java @@ -114,6 +114,8 @@ public class ConciliatorManageVO extends ComDefaultVO { private String procCnd; // 처리구분 I, U private String memTeam; // 조정위원 소속 + + private String searchCondition2; public String[] getMemSeqArr() { @@ -387,6 +389,15 @@ public class ConciliatorManageVO extends ComDefaultVO { public void setMemTeam(String memTeam) { this.memTeam = memTeam; } + + public String getSearchCondition2() { + return searchCondition2; + } + + public void setSearchCondition2(String searchCondition2) { + this.searchCondition2 = searchCondition2; + } + diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java index a2848cf7..68a5ceb3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java @@ -91,6 +91,10 @@ public class ConciliatorManageController { if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){ conciliatorManageVO.setSearchKeyword(egovCryptoUtil.encrypt(conciliatorManageVO.getSearchKeyword())); } + + if (StringUtil.isEmpty(conciliatorManageVO.getSearchCondition2())) { // 위원임기가 null인경우 + conciliatorManageVO.setSearchCondition2("2"); + } /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); @@ -122,6 +126,7 @@ public class ConciliatorManageController { conciliatorManageVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd")); } + return "kccadr/adjPgrMgr/cclt/ConciliatorManageList"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java index 614efbcb..41c330cc 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java @@ -33,7 +33,7 @@ public class PgrCmmDAO extends EgovAbstractDAO { } public Map selectPgrCmmListCntForOnlineOffline(PgrCmmVO pgrCmmVO) throws Exception { - return (Map) select("Cmm.selectPgrCmmListCnt", pgrCmmVO); + return (Map) select("Cmm.selectPgrCmmListCntForOnlineOffline", pgrCmmVO); } /** diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml index 46fbdece..bec7d5a7 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml @@ -91,6 +91,12 @@ T1.MEM_NAME LIKE CONCAT('%' , #searchKeyword#, '%') + + + + + + ORDER BY 1=1 ,$searchSortCnd$ diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 578d2e88..996f6bd1 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -97,7 +97,13 @@ - + SELECT /*+ RULE */ COUNT(1) CNT + + + + + + +
  • +

    위원임기 검색

    + + <%-- 위원임기 --%> <%-- 기준일자 --%> -
    +
    @@ -182,20 +197,6 @@
  • - <%--
  • -

    신청일자

    -
    -
    - -
    - - -
    -
    -
    -
  • --%>