diff --git a/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue b/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue index 7154af7..84d89f4 100644 --- a/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue +++ b/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue @@ -98,6 +98,7 @@ 제출서류 + + +
+ @@ -191,6 +214,9 @@ export default { memo: '', docList: [], numList: [], + reqSttusCd: '', + apprCnt: 0, + rejtCnt: 0, }; }, components: { @@ -205,6 +231,31 @@ export default { this.formReset(); }, methods: { + + + //사용자 수정 확인 Open + confirmUpdateOpen() { + var dimmed = document.getElementsByClassName('confirm-update'); + for (var i = 0; i < dimmed.length; i++) { + dimmed[i].style.display = 'block'; + } + }, + //사용자 수정 확인 + confirmUpdate() { + var dimmed = document.getElementsByClassName('confirm-update'); + for (var i = 0; i < dimmed.length; i++) { + dimmed[i].style.display = 'none'; + } + this.doSave(); + }, + // 사용자 수정 Close + confirmUpdateClose() { + var dimmed = document.getElementsByClassName('confirm-update'); + for (var i = 0; i < dimmed.length; i++) { + dimmed[i].style.display = 'none'; + } + }, + //파일 다운로드 download(filePath, fileName, docTitle) { this.row = {}; @@ -225,6 +276,7 @@ export default { try { this.row.regReqNo = props.regReqNo; this.row.docNo = props.docNo; + this.reqSttusCd = props.reqSttusCd; const response = await sendNumMgtApi.apprDetail(this.row); const result = response.data; if (result != null && result.retCode == '0000') { @@ -258,6 +310,8 @@ export default { rejtCnt = rejtCnt + 1; } }); + this.apprCnt = apprCnt; + this.rejtCnt = rejtCnt; /* if (apprCnt == this.numList.length) { this.$refs.apprRadio.checked = true; } else if (rejtCnt == this.numList.length) { @@ -299,6 +353,8 @@ export default { rejtCnt = rejtCnt + 1; } }); + this.apprCnt = apprCnt; + this.rejtCnt = rejtCnt; /* if (apprCnt == this.numList.length) { this.$refs.apprRadio.checked = true; } else if (rejtCnt == this.numList.length) { @@ -306,7 +362,8 @@ export default { } */ }, updateSttus() { - this.doSave(); + this.confirmUpdateOpen(); + // this.doSave(); }, async doSave() { this.row.memo = this.memo; diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java index 71ef682..405a206 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java @@ -618,12 +618,6 @@ public class SendNumMgtService { SendNumMgtMapper sendNumMgtMapper = sqlSessionMaster.getMapper(SendNumMgtMapper.class); - logger.debug("넘어오는 값 확인하기={}",updateApprReqDto); - - String adminId = updateApprReqDto.getAdminId(); - - String userEmail = sendNumMgtMapper.selectUserEmailByAdminId(adminId); - Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); UserDetails userDetails = (UserDetails) principal; String regId = userDetails.getUsername(); @@ -657,12 +651,15 @@ public class SendNumMgtService { //2. 반려 발신번호 리스트에 값이 있을 경우 메일을 보냄 if(sndrNoList.size()>0) { + // 3. 반려 발신번호 메일 대상 주소 + String adminId = updateApprReqDto.getAdminId(); + String userEmail = sendNumMgtMapper.selectUserEmailByAdminId(adminId); //3. 발신번호 리스트 치환 String SndrNoString = sndrNoList.toString(); - String re1 = SndrNoString.replace("[", "
"); - String re2 = re1.replace(", ","

"); - String re3 = re2.replace("]", "
"); + String SndrNoRe1 = SndrNoString.replace("[", "
"); + String SndrNoRe2 = SndrNoRe1.replace(", ","

"); + String SndrNoRe3 = SndrNoRe2.replace("]", "
"); // logger.debug("발신번호 리스트 스트링 ={}",re3); //try catch 처리하기 @@ -675,7 +672,7 @@ public class SendNumMgtService { //3. 메일에 담을 내용 셋팅 mailReqMap.put("applicationId", apiApplicationId); mailReqMap.put("authToken", apiAuthToken); - mailReqMap.put("rejectListSndrNo", re3); + mailReqMap.put("rejectListSndrNo", SndrNoRe3); mailReqMap.put("rejectHtml", updateApprReqDto.getMemo()); //이메일 수신자 가져오는 쿼리 mailReqMap.put("toEmail", userEmail);