diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java index 4976f512..9fa6fb38 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -123,5 +123,7 @@ public interface ApmService { void updtRpplPopPastAjax(RpplVO rpplVO); Map findByResPonDentDIdAndFileList(RpplVO rpplVO); + + String selectSbmtRejectApproval(String param) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java index 8615070d..2a352cae 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java @@ -231,5 +231,9 @@ public class ApmDAO extends EgovAbstractDAO { public RpplVO findByResPonDentDId(RpplVO rpplVO) { return (RpplVO) select("Apm.findByResPonDentDId", rpplVO); } + + public String selectSbmtRejectApproval(String param) throws Exception { + return (String) select("apmDAO.selectSbmtRejectApproval", param); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java index 0c88b9da..e7a2c39f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java @@ -640,6 +640,13 @@ public class ApmServiceImpl implements ApmService { } + + + @Override + public String selectSbmtRejectApproval(String param) throws Exception { + return apmDAO.selectSbmtRejectApproval(param); + } + /** * @methodName : rpplDataEncrypt * @author : 이호영 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 8d79fd07..02be69aa 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -543,6 +543,27 @@ public class ApmController { //진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기 model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq())); + //결재 반려 시 결재 상세에서 반려한 사람 표시 + String result = apmService.selectSbmtRejectApproval(cmmVO.getAdrSeq()); + String userNm = ""; + + if(result != null) { + /* + * splitResult[0] -> uniqueId + * splitResult[1] -> userNm + * splitResult[2] -> userTy + * */ + String[] splitResult = result.split("§"); + userNm = splitResult[1]; + if("mem".equals(splitResult[2])) { + userNm = egovCryptoUtil.decrypt(splitResult[1]) + " 조정부장"; + }else { + userNm = userNm + " 관리자"; + } + } + + model.addAttribute("rejectApproval", userNm); + /*//adr_mgr_detail 첨부파일 불러오기 FileVO fileVO = new FileVO(); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml index 314ff7bd..15d6e2ef 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml @@ -1301,5 +1301,32 @@ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 1387b71b..d1877e3f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -2041,6 +2041,9 @@ $(document).ready(function(){ ( 결재 대기 중) + + ( 반려) +