tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

이준호 전자조정시스템 고도화 커밋

Browse Source 
- 결재 반려 시 반려자 이름 노출 추가
This commit is contained in:
leejunho 2023-02-10 18:00:31 +09:00
parent 8473461a23
commit 66cb466c70
6 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java
View File

@ -123,5 +123,7 @@ public interface ApmService {
void updtRpplPopPastAjax(RpplVO rpplVO);
Map<String, Object> findByResPonDentDIdAndFileList(RpplVO rpplVO);
String selectSbmtRejectApproval(String param) throws Exception;
}

4
src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java
View File

@ -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);
}
}

7
src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java
View File

@ -640,6 +640,13 @@ public class ApmServiceImpl implements ApmService {
}
@Override
public String selectSbmtRejectApproval(String param) throws Exception {
return apmDAO.selectSbmtRejectApproval(param);
}
/**
* @methodName : rpplDataEncrypt
* @author : 이호영

21
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

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

27
src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml
View File

@ -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>

3
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
View File

@ -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>