이준호 전자조정시스템고도화 커밋

- 부서장, 위원장 로그인 시 대시보드 에러 수정

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;
+	}
+	
 	
 	
 	

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";
     }

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java

@@ -33,7 +33,7 @@ public class PgrCmmDAO extends EgovAbstractDAO {
     }
     
     public Map<String, Integer> selectPgrCmmListCntForOnlineOffline(PgrCmmVO pgrCmmVO) throws Exception {
-        return (Map) select("Cmm.selectPgrCmmListCnt", pgrCmmVO);
+        return (Map) select("Cmm.selectPgrCmmListCntForOnlineOffline", pgrCmmVO);
     }
 
     /**

src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml

@@ -91,6 +91,12 @@
 				T1.MEM_NAME LIKE CONCAT('%' , #searchKeyword#, '%')
 			</isEqual>
 		</isNotEmpty>
+		<isEqual prepend="AND" property="searchCondition2" compareValue="1">
+			
+		</isEqual>
+		<isEqual prepend="AND" property="searchCondition2" compareValue="2">
+			
+		</isEqual>
 		ORDER BY 1=1
 		<isNotEmpty property="searchSortCnd">
 			,$searchSortCnd$

src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml

@@ -97,7 +97,13 @@
 	</sql>
 
 	<!-- 목록 조회 전체건수 쿼리 -->
-	<select id="Cmm.selectPgrCmmListCnt" resultClass="egovframework.rte.psl.dataaccess.util.EgovMap">
+	<select id="Cmm.selectPgrCmmListCnt" resultClass="int">
+		SELECT /*+ RULE */ COUNT(1) CNT
+		<include refid="Cmm.selectPgrCmmSql"></include>
+	</select>
+	
+	<!-- 목록 조회 전체건수 쿼리 -->
+	<select id="Cmm.selectPgrCmmListCntForOnlineOffline" resultClass="egovframework.rte.psl.dataaccess.util.EgovMap">
 		SELECT /*+ RULE */ COUNT(1) CNT,
 		       COUNT(CASE WHEN TRIM(M.req_ol_cd)='0' THEN 1 end) CNT_ONLINE,
        		   COUNT(CASE WHEN TRIM(M.req_ol_cd)='1' THEN 1 end) CNT_OFFLINE

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp

@@ -37,6 +37,7 @@
 		//해당 페이지에 대한 권한 체크
 		_admin_fn_check_authority("ConciliatorManageList", "div.cont", "ALL");
 		setSearchMonthDate(1);
+		setSearchCondition(<c:out value="${conciliatorManageVO.searchCondition2}"/>);
 	});
 
 	//권한 체크 결과값으로 후속처리
@@ -98,16 +99,24 @@
 	
 	function fnSearchClear(){
 		$('#searchKeyword').val('');
-		setSearchMonthDate(1);
-		setSearchCondition();
 	}
 	
 	function setSearchMonthDate(month) {
 		$("input[name=searchStartDt]").val(moment('<fmt:formatDate value="${now}" pattern="yyyy-MM-dd" />').format('YYYY-MM-DD'));
 	}
 	
-	function setSearchCondition(){
-		
+	function setSearchCondition(p){
+		if(p == 1){
+			$('#searchYear').show();
+			$('#searchYearMonthDay').hide();
+		} else if(p == 2){
+			$('#searchYear').hide();
+			$('#searchYearMonthDay').show();
+		}
+		else{
+			$('#searchYear').hide();
+			$('#searchYearMonthDay').hide();
+		}
 	}
 
 </script>
@@ -149,13 +158,19 @@
 									<option value="" <c:if test="${empty conciliatorManageVO.searchCondition}">selected="selected"</c:if>>전체</option>
 									<option value="1" <c:if test="${conciliatorManageVO.searchCondition eq '1'}">selected="selected"</c:if>>아이디</option>
 									<option value="2" <c:if test="${conciliatorManageVO.searchCondition eq '2'}">selected="selected"</c:if>>조정위원</option>
-									
 									<option value="3" <c:if test="${conciliatorManageVO.searchCondition eq '3'}">selected="selected"</c:if>>조정부</option>
-									<option value="4" <c:if test="${conciliatorManageVO.searchCondition eq '4'}">selected="selected"</c:if>>위원임기</option>
-									<option value="5" <c:if test="${conciliatorManageVO.searchCondition eq '5'}">selected="selected"</c:if>>기준일자</option>
 								</select>
 								<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${conciliatorManageVO.searchKeyword}'/>">
 								<button class="btn_search" onclick="fncSelectConciliatorManageList(); return false;">검색</button>
+							</li>
+							<li>
+								<p class="tit_text">위원임기 검색</p>
+								<select name="searchCondition" id="searchCondition" onchange="setSearchCondition(this.value);">
+									<option value="" <c:if test="${empty conciliatorManageVO.searchCondition2}">selected="selected"</c:if>>전체</option>
+									<option value="1" <c:if test="${conciliatorManageVO.searchCondition2 eq '1'}">selected="selected"</c:if>>위원임기</option>
+									<option value="2" <c:if test="${conciliatorManageVO.searchCondition2 eq '2'}">selected="selected"</c:if>>기준일자</option>
+								</select>
+								
 								<%-- 위원임기 --%>
 								<select name="searchYear" id="searchYear" class="search1">
 									<option value="2018" ${conciliatorManageVO.searchYear eq '2018' ? 'selected' : '' }>2018년</option>
@@ -170,7 +185,7 @@
                                     <option value="2027" ${conciliatorManageVO.searchYear eq '2027' ? 'selected' : '' }>2027년</option>
                                 </select>
                                 <%-- 기준일자 --%>
-								<div class="radio_wrap">
+								<div class="radio_wrap" id="searchYearMonthDay">
 									<div id="sel_date" class="sel_date">
 										<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${conciliatorManageVO.searchStartDt}" data-datecontrol="true">
 										<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
@@ -182,20 +197,6 @@
 									</div>
 								</div>
 							</li>
-							<%-- <li>
-								<p class="tit_text">신청일자</p>
-								<div class="radio_wrap">
-									<div id="sel_date" class="sel_date">
-										<input type="text" class="startDate inp" title="검색시작일" id="startDate01" name="searchStartDt" value="${conciliatorManageVO.searchStartDt}" data-datecontrol="true">
-										<div class="calendar_in" id="calendarName_startDate" style="z-index: 9;">
-											<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('startDate01-lry','',this)" class="btn_cal"></button>
-											<div id="startDate01-lry" class="calendarPop" style="display: none;">
-												<iframe id="startDate01-ifrm" name="startDate01-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
-											</div>
-										</div>
-									</div>
-								</div>
-							</li> --%>
 						</ul>
 					</div>
 				</div>