tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

이지우 - 관리자 조정종결목록에 조정조사관 조회 구분 추가

Browse Source
This commit is contained in:
jiwoo 2023-07-14 16:38:05 +09:00
parent ce45174069
commit aec9366f85
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java
View File

@ -128,6 +128,20 @@ public class AdjClsMgrController {
log.debug("commandMap : {}", commandMap);
log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty());
//조정조사관, 조정팀장일 시 조정조사관 조회 구분 추가
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
String userId = loginVO == null ? "" : loginVO.getUniqId().toString().trim();
commandMap.put("searchLoginId", userId);
if(("".equals(commandMap.get("searchEachAdrAdminYn")) || commandMap.get("searchEachAdrAdminYn") == null)&& "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
commandMap.put("searchEachAdrAdminYn", "Y");
}
if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) {
commandMap.put("searchEachAdrAdminBtnYn", "Y");
}
//기본값설정
commandMap.put("rangeView", "kcc_adr_advc");
String searchWrd = (String) commandMap.get("q");

6
src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java
View File

@ -347,6 +347,8 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
String searchCondition = (String)commandMap.get("searchCondition");
String searchCondition2 = (String)commandMap.get("searchCondition2");
String searchEachAdrAdminYn = (String)commandMap.get("searchEachAdrAdminYn");
String searchLoginId = (String)commandMap.get("searchLoginId");
//검색조건 추가
if( !"*:*".equals(_q.toString()) && StringUtils.isEmpty(searchCondition)){
@ -382,6 +384,10 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
}
//조정조사관 조회 구분 라디오 버튼 - 담당사건만 보기
if("Y".equals(searchEachAdrAdminYn)) {
query.addFilterQuery("adrAdmId:" + searchLoginId);
}
if (StringUtils.isNotBlank(sdate) && StringUtils.isNotBlank(edate)) {
query.addFilterQuery("registDt:["+sdate+" TO "+edate+"]");

17
src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
View File

@ -41,6 +41,7 @@
listForm.q.value = q1 ;
listForm.searchCondition.value = form.searchCondition.value;
listForm.searchCondition2.value = getCheckboxValue();
listForm.searchEachAdrAdminYn.value = form.searchEachAdrAdminYn.value;
listForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
listForm.submit();
}
@ -94,6 +95,7 @@
<%-- <input type="hidden" name="searchStatus" value="<c:out value="${adjClsMgrVO.searchStatus}" />" /> --%>
<input type="hidden" name="adrSeq" value="" />
<input type="hidden" name="adrSn" value="" />
<input type="hidden" name="searchEachAdrAdminYn" value="<c:out value="${commandMap.searchEachAdrAdminYn}" />" />
</form>
<form:form id="form" name="form" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
<!-- cont -->
@ -158,6 +160,21 @@
</span>
</div>
</li>
<li <c:if test="${commandMap.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>>
<p class="tit_text">조정조사관 조회 구분</p>
<div class="radio_wrap">
<span>
<input ${commandMap.searchEachAdrAdminYn eq 'Y' ? 'checked=\"checked\"' : ''} value="Y" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn1">
<label for="searchEachAdrAdminYn1">담당사건만 보기</label>
</span>
<span>
<input ${commandMap.searchEachAdrAdminYn eq 'N' ? 'checked=\"checked\"' : ''} value="N" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn2">
<label for="searchEachAdrAdminYn2">전체 보기</label>
</span>
</div>
</li>
</ul>
</div>
</div>