From bf2bf99cccfa43f2ffa05d8fedf15de81bfa1091 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 25 Jul 2023 17:28:39 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - "조정종결관리 > 조정종결목록 > 목록 1. 조정조사관 선택 select box 생성 (전체, 조사관이름 나열)" - "조정진행관리 > 조정진행목록 > 목록 1. 조정조사관 선택 select box 생성 (전체, 조사관이름 나열)" 수정 --- .../adjPgrMgr/apm/web/ApmController.java | 21 ++++++++----- .../adjPgrMgr/cmm/service/PgrCmmService.java | 3 ++ .../adjPgrMgr/cmm/service/PgrCmmVO.java | 11 ------- .../adjPgrMgr/cmm/service/impl/PgrCmmDAO.java | 5 +++ .../cmm/service/impl/PgrCmmServiceImpl.java | 5 +++ .../adjclsmgr/web/AdjClsMgrController.java | 31 ++++++++++++++----- .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 18 +++++++++++ .../jsp/kccadr/adjPgrMgr/apm/apmList.jsp | 16 +++++++--- .../kccadr/adjclsmgr/adjCloseMangeList.jsp | 20 ++++++++---- 9 files changed, 94 insertions(+), 36 deletions(-) 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 b3133efb..cd75b68d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -45,6 +45,7 @@ import kcc.com.cmm.util.IpUtil; import kcc.com.cmm.util.MagicDBAPIUtil; import kcc.com.cmm.util.SequenceUtil; import kcc.com.cmm.util.StringUtil; +import kcc.com.cmm.util.StringUtil2; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.com.utl.user.service.CheckFileUtil; @@ -322,14 +323,18 @@ public class ApmController { } //담당사건만 보기 여부 - 기본 : 전체 조회 / 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"); + if(StringUtil2.isEmpty(cmmVO.getSearchLoginId())) { + if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { + cmmVO.setSearchEachAdrAdminYn("Y"); + cmmVO.setSearchLoginId(userId); + } + }else { + if(!"all".equals(cmmVO.getSearchLoginId())){ + cmmVO.setSearchEachAdrAdminYn("Y"); + } } +// cmmVO.setSearchEachAdrAdminYn("Y"); + /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(cmmVO.getPageIndex()); @@ -359,6 +364,8 @@ public class ApmController { } } + //조정조사관 리스트 + model.addAttribute("adrAdminList", cmmService.selectPgrCmmAdrAdminList()); return "/kccadr/adjPgrMgr/apm/apmList"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java index 31056958..76e27511 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; +import kcc.let.uss.umt.service.UserManageVO; public interface PgrCmmService { @@ -74,4 +75,6 @@ public interface PgrCmmService { int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception; public List selectPgrCmmListForExcel(PgrCmmVO pgrCmmVO) throws Exception; + + List selectPgrCmmAdrAdminList() throws Exception; } 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 2f4b1203..ce3ac4f7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -269,9 +269,6 @@ public class PgrCmmVO implements Serializable { private String searchLoginId ; // 본인 ID - private String searchEachAdrAdminBtnYn = ""; // 담당사건민 보기 버튼 노출 여부 - - public String getAdrAdmId() { return adrAdmId; } @@ -1657,14 +1654,6 @@ public class PgrCmmVO implements Serializable { this.searchEachAdrAdminYn = searchEachAdrAdminYn; } - public String getSearchEachAdrAdminBtnYn() { - return searchEachAdrAdminBtnYn; - } - - public void setSearchEachAdrAdminBtnYn(String searchEachAdrAdminBtnYn) { - this.searchEachAdrAdminBtnYn = searchEachAdrAdminBtnYn; - } - public String getSearchLoginId() { return searchLoginId; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java index 41c330cc..6da10385 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java @@ -9,6 +9,7 @@ import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; +import kcc.let.uss.umt.service.UserManageVO; @Repository("PgrCmmDAO") public class PgrCmmDAO extends EgovAbstractDAO { @@ -116,5 +117,9 @@ public class PgrCmmDAO extends EgovAbstractDAO { public int updateEntBeforeDtbAdrAdminReg(PgrCmmVO pgrCmmVO) throws Exception { return (Integer) update("Cmm.updateEntBeforeDtbAdrAdminReg",pgrCmmVO); } + + public List selectPgrCmmAdrAdminList() throws Exception { + return (List) list("Cmm.selectPgrCmmAdrAdminList"); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index 08584baf..dac2e104 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -22,6 +22,7 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; +import kcc.let.uss.umt.service.UserManageVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @Repository("pgrCmmService") @@ -572,5 +573,9 @@ public class PgrCmmServiceImpl implements PgrCmmService { return (Integer) pgrCmmDAO.updateEntBeforeDtbAdrAdminReg(pgrCmmVO); } + @Override + public List selectPgrCmmAdrAdminList() throws Exception { + return pgrCmmDAO.selectPgrCmmAdrAdminList(); + } } diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index 04895d9b..a8554d2c 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -34,6 +34,7 @@ import egovframework.rte.fdl.string.EgovStringUtil; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.com.cmm.util.StringUtil; +import kcc.com.cmm.util.StringUtil2; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; @@ -131,14 +132,26 @@ public class AdjClsMgrController { //조정조사관, 조정팀장일 시 조정조사관 조회 구분 추가 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"); - } +// 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"); +// } - if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { - commandMap.put("searchEachAdrAdminBtnYn", "Y"); + //담당사건만 보기 여부 - 기본 : 전체 조회 / ROLE_ADR_ADMIN 권한에 조정조사관 or 조정팀장은 기본 : 담당사건만 조회 + if(StringUtil2.isEmpty((String)commandMap.get("searchLoginId"))) { + if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { + commandMap.put("searchEachAdrAdminYn", "Y"); + commandMap.put("searchLoginId", userId); + } + }else { + if(!"all".equals((String)commandMap.get("searchLoginId"))){ + commandMap.put("searchEachAdrAdminYn", "Y"); + } } @@ -204,7 +217,9 @@ public class AdjClsMgrController { model.addAttribute("commandMap", commandMap); - model.addAttribute("totalRecordCount", totalRecordCount); + model.addAttribute("totalRecordCount", totalRecordCount); + //조정조사관 리스트 + model.addAttribute("adrAdminList", cmmService.selectPgrCmmAdrAdminList()); }catch(Exception ex) { ex.printStackTrace(); } 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 b60f800d..739622df 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 @@ -69,6 +69,9 @@ DM.MEM_DEPT_NM LIKE '%'||TRIM(#searchKeyword#)||'%' + + AU.USER_NM LIKE '%'||TRIM(#searchKeyword#)||'%' + @@ -1644,5 +1647,20 @@ + + 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 ea1ba7a6..861f9af1 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 @@ -167,6 +167,7 @@ + <%-- --%> @@ -212,9 +213,10 @@ -
  • style="display:none;"> -

    조정조사관 조회 구분

    -
    + <%--
  • style="display:none;"> --%> +
  • +

    조정조사관 조회

    + <%--
    @@ -223,7 +225,13 @@ -
    + --%> +

  • 신청일자

    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp index 5c08297d..b88c9ab1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -41,7 +41,7 @@ listForm.q.value = q1 ; listForm.searchCondition.value = form.searchCondition.value; listForm.searchCondition2.value = getCheckboxValue(); - listForm.searchEachAdrAdminYn.value = form.searchEachAdrAdminYn.value; + listForm.searchLoginId.value = form.searchLoginId.value; listForm.action = ""; listForm.submit(); } @@ -95,7 +95,7 @@ <%-- " /> --%> - " /> + " /> @@ -130,6 +130,7 @@ + " onkeyup="if(window.event.keyCode==13){fncGoList()}"/> @@ -161,9 +162,10 @@
    • -
  • style="display:none;"> -

    조정조사관 조회 구분

    -
    + <%--
  • style="display:none;"> --%> +
  • +

    조정조사관 조회

    + <%--
    @@ -172,7 +174,13 @@ -
    + --%> +