From 66cb466c70c0e01759b31b5738e8bdfb7cd7829b Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Fri, 10 Feb 2023 18:00:31 +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=20=20-=20?=
 =?UTF-8?q?=EA=B2=B0=EC=9E=AC=20=EB=B0=98=EB=A0=A4=20=EC=8B=9C=20=EB=B0=98?=
 =?UTF-8?q?=EB=A0=A4=EC=9E=90=20=EC=9D=B4=EB=A6=84=20=EB=85=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adjPgrMgr/apm/service/ApmService.java     |  2 ++
 .../adjPgrMgr/apm/service/impl/ApmDAO.java    |  4 +++
 .../apm/service/impl/ApmServiceImpl.java      |  7 +++++
 .../adjPgrMgr/apm/web/ApmController.java      | 21 +++++++++++++++
 .../kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml    | 27 +++++++++++++++++++
 .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp      |  3 +++
 6 files changed, 64 insertions(+)

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<String, Object> 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 @@
     
     </update>
     
+    <select id="apmDAO.selectSbmtRejectApproval" parameterClass="string" resultClass="string">
+    
+    	SELECT CONCAT(DECODE(T1.sbmt_yn1, 'N', T1.sbmt_id1, DECODE(T1.sbmt_yn2, 'N', T1.sbmt_id2, DECODE(T1.sbmt_yn3, 'N', T1.sbmt_id3))), '§' ,T3.userNm, '§', T3.userTy) AS rejectApproval
+		FROM   adr_sbmt_mgr T1
+		       LEFT OUTER JOIN adr_mgr_master T2
+		       ON     T1.adr_seq = T2.adr_seq
+		       LEFT OUTER JOIN
+		              (SELECT a.esntl_id AS esntlId,
+		                      a.user_nm  AS userNm,
+		                      'admin'    AS userTy
+		              FROM    lettnemplyrinfo a
+		              
+		              UNION ALL
+		              
+		              SELECT b.mem_seq  AS esntlId,
+		                     b.mem_name AS userNm,
+		                     'mem'      AS userTy
+		              FROM   adr_mem_mgr b
+		              )
+		              T3
+		       ON     T1.sbmt_id1                                                                                                  = T3.esntlId OR T1.sbmt_id2 = T3.esntlId OR T1.sbmt_id3 = T3.esntlId
+		WHERE  T1.adr_seq                                                                                                          = #param#
+		AND    T1.sbmt_ty                                                                                                       LIKE LEFT(T2.stat_cd, 4) + '%'
+		AND    DECODE(T1.sbmt_yn1, 'N', T1.sbmt_id1, DECODE(T1.sbmt_yn2, 'N', T1.sbmt_id2, DECODE(T1.sbmt_yn3, 'N', T1.sbmt_id3))) = T3.esntlId
+		    
+    </select>
+    
 </sqlMap>
 
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(){
 									<c:if test="${not empty sbmtStatus}">
 										(<kc:code codeId="CC041" code="${sbmtStatus}"/> 결재 대기 중)
 									</c:if>
+									<c:if test="${not empty rejectApproval}">
+										(<c:out value="${rejectApproval}"/> 반려)
+									</c:if>
 								</p>
 							</td>
 						</tr>