Merge branch 'JIWOO'

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());

src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java

@@ -265,6 +265,13 @@ public class PgrCmmVO implements Serializable {
 
 	private String searchSbmtId ;	// 결제자 검색
 	
+	private String searchEachAdrAdminYn = "";	// 담당사건민 보기 여부 - 조정조사관일 시 선택 가능
+	
+	private String searchLoginId ;	// 본인 ID
+	
+	private String searchEachAdrAdminBtnYn = "";	// 담당사건민 보기 버튼 노출 여부
+	
+    
     public String getAdrAdmId() {
         return adrAdmId;
     }
@@ -1642,5 +1649,30 @@ public class PgrCmmVO implements Serializable {
 	}
 
 
+	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;
+	}
+	
+	
 
 }

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

@@ -93,6 +93,10 @@
 		        ( M.STAT_CD NOT LIKE '10%' OR  M.STAT_CD IN ('104050','101050') )
 		 </isNotEmpty>
 		 
+		 <isEqual property="searchEachAdrAdminYn" compareValue="Y" prepend="AND">
+		 		D.ADR_ADM_ID = #searchLoginId#
+		 </isEqual>
+
 
 	</sql>
 

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp

@@ -212,6 +212,19 @@
                                             </span>
                                         </div>
                                     </li>
+                                    <li <c:if test="${cmmVO.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>>
+                                        <p class="tit_text">조정조사관 조회 구분</p>
+                                        <div class="radio_wrap">
+                                            <span>
+                                                <input ${cmmVO.searchEachAdrAdminYn eq 'Y' ? 'checked=\"checked\"' : ''} value="Y" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn1">
+                                                <label for="searchEachAdrAdminYn1">담당사건만 보기</label>
+                                            </span>
+                                            <span>
+                                                <input ${cmmVO.searchEachAdrAdminYn eq 'N' ? 'checked=\"checked\"' : ''} value="N" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn2">
+                                                <label for="searchEachAdrAdminYn2">전체 보기</label>
+                                            </span>
+                                        </div>
+                                    </li>
                                     <li>
                                         <p class="tit_text">신청일자</p>
                                         <div class="radio_wrap">