diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index c1f53955..39905643 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -259,6 +259,9 @@ public class ApmController { @RequestMapping(value = "apmList.do") public String apmList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, HttpServletRequest request, ModelMap model) throws Exception { + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + /* * if(apmVO.getPageUnit() != 10) { apmVO.setPageUnit(apmVO.getPageUnit()); } */ @@ -318,6 +321,15 @@ public class ApmController { cmmVO.setCkStsList(tmpList.toArray(new String[tmpList.size()])); } + //담당사건만 보기 여부 - 기본 : 전체 조회 / ROLE_ADR_ADMIN 권한에 조정조사관 or 조정팀장은 기본 : 담당사건만 조회 + cmmVO.setSearchLoginId(userId); + if("".equals(cmmVO.getSearchEachAdrAdminYn()) && "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { + cmmVO.setSearchEachAdrAdminYn("Y"); + } + //조정조사관 or 조정팀장일 경우 담당사거만 보기 라이도 버튼 여부 Y + if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { + cmmVO.setSearchEachAdrAdminBtnYn("Y"); + } /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(cmmVO.getPageIndex()); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 6c65cebe..2f4b1203 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -264,6 +264,13 @@ public class PgrCmmVO implements Serializable { private String searchMonth = "3"; //검색월선택 private String searchSbmtId ; // 결제자 검색 + + private String searchEachAdrAdminYn = ""; // 담당사건민 보기 여부 - 조정조사관일 시 선택 가능 + + private String searchLoginId ; // 본인 ID + + private String searchEachAdrAdminBtnYn = ""; // 담당사건민 보기 버튼 노출 여부 + public String getAdrAdmId() { return adrAdmId; @@ -1640,6 +1647,31 @@ public class PgrCmmVO implements Serializable { public void setAppliCantUsrTy(String appliCantUsrTy) { this.appliCantUsrTy = appliCantUsrTy; } + + + public String getSearchEachAdrAdminYn() { + return searchEachAdrAdminYn; + } + + public void setSearchEachAdrAdminYn(String searchEachAdrAdminYn) { + this.searchEachAdrAdminYn = searchEachAdrAdminYn; + } + + public String getSearchEachAdrAdminBtnYn() { + return searchEachAdrAdminBtnYn; + } + + public void setSearchEachAdrAdminBtnYn(String searchEachAdrAdminBtnYn) { + this.searchEachAdrAdminBtnYn = searchEachAdrAdminBtnYn; + } + + public String getSearchLoginId() { + return searchLoginId; + } + + public void setSearchLoginId(String searchLoginId) { + this.searchLoginId = searchLoginId; + } 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 996f6bd1..b60f800d 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 @@ -92,6 +92,10 @@ ( M.STAT_CD NOT LIKE '10%' OR M.STAT_CD IN ('104050','101050') ) + + + D.ADR_ADM_ID = #searchLoginId# + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp index c731fac2..ea1ba7a6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp @@ -212,6 +212,19 @@ +
  • style="display:none;"> +

    조정조사관 조회 구분

    +
    + + + + + + + + +
    +
  • 신청일자