이준호 전자조정시스템 고도화 커밋
- 조정위원 관리 수정요청사항 수정 중
This commit is contained in:
parent
9613209f9b
commit
2ff1e56691
@ -1,5 +1,6 @@
|
||||
package kcc.kccadr.adjPgrMgr.cclt.web;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@ -7,6 +8,8 @@ import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang.time.DateFormatUtils;
|
||||
import org.apache.commons.lang.time.DateUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
@ -26,6 +29,7 @@ import kcc.com.cmm.service.EgovFileMngService;
|
||||
import kcc.com.cmm.service.EgovFileMngUtil;
|
||||
import kcc.com.cmm.service.FileVO;
|
||||
import kcc.com.cmm.util.RedirectUrlMaker;
|
||||
import kcc.com.cmm.util.StringUtil;
|
||||
import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageService;
|
||||
import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageVO;
|
||||
import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageService;
|
||||
@ -106,6 +110,18 @@ public class ConciliatorManageController {
|
||||
if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){
|
||||
conciliatorManageVO.setSearchKeyword(egovCryptoUtil.decrypt(conciliatorManageVO.getSearchKeyword()));
|
||||
}
|
||||
|
||||
if (StringUtil.isEmpty(conciliatorManageVO.getSearchStartDt())) { // 조회일시가 null인경우
|
||||
Date today = new Date();
|
||||
//조정진행목록 보이는 화면 수정 요청_230524
|
||||
int month = -1;
|
||||
if(StringUtil.isNotEmpty(conciliatorManageVO.getSearchMonth())) {
|
||||
month = -(Integer.valueOf(conciliatorManageVO.getSearchMonth()));
|
||||
}
|
||||
conciliatorManageVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd"));
|
||||
conciliatorManageVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
|
||||
|
||||
}
|
||||
|
||||
return "kccadr/adjPgrMgr/cclt/ConciliatorManageList";
|
||||
}
|
||||
|
||||
@ -59,21 +59,25 @@
|
||||
T1.FRST_REGISTER_ID AS frstRegisterId,
|
||||
DATE_FORMAT(T1.LAST_UPDT_PNTTM, '%Y-%m-%d') AS lastUpdtPnttm,
|
||||
T1.LAST_UPDUSR_ID AS lastUpdusrId,
|
||||
(
|
||||
SELECT
|
||||
CASE
|
||||
WHEN COUNT(*) <![CDATA[ <= ]]> 1 THEN GROUP_CONCAT(MEM_DEPT_NM SEPARATOR ',')
|
||||
ELSE MEM_DEPT_NM || '(' || (COUNT(*)-1) || ')'
|
||||
END MEM_DEPT_NMS
|
||||
FROM ADR_MEM_DEPT_MGR S1 INNER JOIN ADR_MEM_DEPT_MAP S2
|
||||
ON S1.MEM_DEPT_SEQ = S2.MEM_DEPT_SEQ
|
||||
WHERE 1=1
|
||||
AND S2.MEM_SEQ = T1.MEM_SEQ
|
||||
GROUP BY S2.MEM_SEQ
|
||||
ORDER BY S2.MEM_SEQ
|
||||
) AS memDeptNms,
|
||||
DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) AS memDeptNms,
|
||||
(SELECT COUNT(1) FROM ADR_MEM_DEPT_MAP WHERE MEM_SEQ = T1.MEM_SEQ) AS memDeptTot
|
||||
FROM ADR_MEM_MGR T1
|
||||
LEFT JOIN
|
||||
( SELECT S2.MEM_SEQ,
|
||||
CASE
|
||||
WHEN COUNT(*) > 1
|
||||
THEN GROUP_CONCAT(MEM_DEPT_NM SEPARATOR ',')
|
||||
ELSE '-'
|
||||
END MEM_DEPT_NMS
|
||||
FROM ADR_MEM_DEPT_MGR S1
|
||||
INNER JOIN ADR_MEM_DEPT_MAP S2
|
||||
ON S1.MEM_DEPT_SEQ = S2.MEM_DEPT_SEQ
|
||||
WHERE 1 =1
|
||||
GROUP BY S2.MEM_SEQ
|
||||
ORDER BY S2.MEM_SEQ
|
||||
)
|
||||
T2
|
||||
ON T2.MEM_SEQ = T1.MEM_SEQ
|
||||
WHERE 1=1
|
||||
<isNotEmpty property="searchKeyword">
|
||||
<isEqual prepend="AND" property="searchCondition" compareValue="">
|
||||
|
||||
@ -7,6 +7,8 @@
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
|
||||
<c:set var="now" value="<%=new java.util.Date()%>" />
|
||||
<%
|
||||
/**
|
||||
* @Class Name : ConciliatorManageList.jsp
|
||||
@ -34,6 +36,7 @@
|
||||
|
||||
//해당 페이지에 대한 권한 체크
|
||||
_admin_fn_check_authority("ConciliatorManageList", "div.cont", "ALL");
|
||||
setSearchMonthDate(1);
|
||||
});
|
||||
|
||||
//권한 체크 결과값으로 후속처리
|
||||
@ -94,7 +97,17 @@
|
||||
}
|
||||
|
||||
function fnSearchClear(){
|
||||
$('#searchKeyword').val('')
|
||||
$('#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(){
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
@ -127,33 +140,85 @@
|
||||
<div class="cont">
|
||||
<!-- list_top -->
|
||||
<div class="list_top">
|
||||
<p>총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}"/></span>건</p>
|
||||
<div class="list_util">
|
||||
<select name="searchCondition" id="searchCondition" onchange="fnSearchClear();">
|
||||
<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>
|
||||
</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>
|
||||
<div class="detail_search">
|
||||
<ul>
|
||||
<li>
|
||||
<p class="tit_text">구분</p>
|
||||
<select name="searchCondition" id="searchCondition" onchange="fnSearchClear();">
|
||||
<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>
|
||||
<%-- 위원임기 --%>
|
||||
<select name="searchYear" id="searchYear" class="search1">
|
||||
<option value="2018" ${conciliatorManageVO.searchYear eq '2018' ? 'selected' : '' }>2018년</option>
|
||||
<option value="2019" ${conciliatorManageVO.searchYear eq '2019' ? 'selected' : '' }>2019년</option>
|
||||
<option value="2020" ${conciliatorManageVO.searchYear eq '2020' ? 'selected' : '' }>2020년</option>
|
||||
<option value="2021" ${conciliatorManageVO.searchYear eq '2021' ? 'selected' : '' }>2021년</option>
|
||||
<option value="2022" ${conciliatorManageVO.searchYear eq '2022' ? 'selected' : '' }>2022년</option>
|
||||
<option value="2023" ${conciliatorManageVO.searchYear eq '2023' ? 'selected' : '' }>2023년</option>
|
||||
<option value="2024" ${conciliatorManageVO.searchYear eq '2024' ? 'selected' : '' }>2024년</option>
|
||||
<option value="2025" ${conciliatorManageVO.searchYear eq '2025' ? 'selected' : '' }>2025년</option>
|
||||
<option value="2026" ${conciliatorManageVO.searchYear eq '2026' ? 'selected' : '' }>2026년</option>
|
||||
<option value="2027" ${conciliatorManageVO.searchYear eq '2027' ? 'selected' : '' }>2027년</option>
|
||||
</select>
|
||||
<%-- 기준일자 --%>
|
||||
<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>
|
||||
<%-- <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>
|
||||
|
||||
</div>
|
||||
<!-- //list_top -->
|
||||
|
||||
<div class="list_top">
|
||||
<p>총 건수 : <span><c:out value="${paginationInfo.totalRecordCount}"/></span>건</p>
|
||||
</div>
|
||||
<!-- list -->
|
||||
<div class="list tbType01">
|
||||
<table>
|
||||
<colgroup>
|
||||
<%--<col style="width: 4%">--%>
|
||||
<col style="width: 4%">
|
||||
<col style="width: 4%">
|
||||
<col style="width: 7%">
|
||||
<col style="width: 9%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 3%">
|
||||
<col style="width: 15%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 4%">
|
||||
<col style="width: 9%">
|
||||
<col style="width: 7%">
|
||||
<col style="width: 8%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 5%">
|
||||
<col style="width: 5%">
|
||||
<col style="width: 5%">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
@ -185,14 +250,15 @@
|
||||
</c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<%-- <c:choose>
|
||||
<c:when test="${empty list.memDeptTot }">
|
||||
-
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
조정부(${list.memDeptTot})
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:choose> --%>
|
||||
<c:out value="${list.memDeptNms}"/>
|
||||
</td>
|
||||
<td>
|
||||
<c:out value="${list.memName}"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user