From 480d7dac5a54b63dc6074144bf2bd97e98214d63 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 15:10:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=B1=EC=8A=B9=EC=9D=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=98=88=EC=83=81=EC=99=84=EB=A3=8C=EC=9D=BC=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EC=B6=94=EA=B0=80=20&=20=EC=8A=B9=EC=9D=B8?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=8B=9C=20"=EC=A7=84=ED=96=89=EC=A4=91"=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/portalAppApprovalManPopup.jsp | 57 ++++++++++++++++++- .../onl/apim/approval/portalApprovalMan.jsp | 15 ++++- .../approval/PortalApprovalManController.java | 6 ++ .../approval/PortalApprovalManService.java | 17 ++++++ .../onl/apim/approval/PortalApprovalUI.java | 2 + 5 files changed, 92 insertions(+), 5 deletions(-) diff --git a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp index ad28250..03e3996 100644 --- a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp @@ -38,12 +38,22 @@ var loginUser = '<%= loginVo.getUserId() %>'; var url = ''; var url_view = ''; + + function dateFormat(cellvalue) { + if ( cellvalue == null || cellvalue.length < 8 ) + return ''; + return cellvalue.substr(0 ,4) + '-' + + cellvalue.substr(4, 2) + '-' + + cellvalue.substr(6, 2) ; + } $(document).ready(function () { var key = "${param.id}"; if (key) { detail(key); } + + $("#expectEndDate").datepicker().inputmask("yyyy-mm-dd", {'autoUnmask': true}); $("#btn_app_approve").click(function () { if (confirm("승인하시겠습니까?")) { @@ -112,6 +122,28 @@ }); } }); + + $("#btn_modify").click(function () { + if (confirm("수정하시겠습니까?")) { + $.ajax({ + type: "POST", + url: url, + data: {cmd: "UPDATE", id: key, expectEndDate: $("#expectEndDate").val().replaceAll('-','')}, + success: function (args) { + alert("수정되었습니다."); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } + window.close(); + }, + error: function (e) { + alert(e.responseText); + } + }); + } + }); $("#btn_close").click(function () { window.close(); @@ -126,12 +158,25 @@ data: {cmd: 'DETAIL', id: key}, success: function (json) { var data = json; + + if (data.approvalStatus.code == 'END') { + $('#btn_modify').hide(); + $('#expectEndDate').hide(); + $('#spExpectEndDate').show(); + $('#spExpectEndDate').text(dateFormat(data.expectEndDate)); + } else { + $('#btn_modify').show(); + $('#expectEndDate').show(); + $('#spExpectEndDate').hide(); + } + $("#approvalType").text(data.approvalType === 'USER' ? "법인사용자" : "API 사용"); $("#approvalStatus").text(data.approvalStatus.description); $("#requesterName").text(data.requester.userName); $("#approvalSubject").text(data.approvalSubject); $("#approvalDetail").html(data.approvalDetail); $("#createdDate").text(data.createdDate).inputmask("9999-99-99 99:99:99.999", {'autoUnmask': true}); + $("#expectEndDate").val(data.expectEndDate); if (data.approvers.some(approver => approver.approverStatus === 'CURRENT' && @@ -144,7 +189,7 @@ document.getElementById("btn_app_reject").style.display = "none"; } - if (data.approvalStatus.description === '배포실패') { + if (data.approvalStatus.code === 'FAILED') { document.getElementById("btn_app_redeploy").style.display = ""; } @@ -242,9 +287,14 @@ 상세 내용 - +
+ 예상완료일 + + + + @@ -282,6 +332,9 @@
+ diff --git a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp index dff4b54..c00c10b 100644 --- a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp +++ b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp @@ -21,6 +21,14 @@ 'USER': '법인사용자', 'APP': 'API 사용' }; + + function dateFormat(cellvalue, options, rowObject) { + if ( cellvalue == null || cellvalue.length < 8 ) + return ''; + return cellvalue.substr(0 ,4) + '-' + + cellvalue.substr(4, 2) + '-' + + cellvalue.substr(6, 2) ; + } $(document).ready(function() { $('#grid').jqGrid({ @@ -33,7 +41,7 @@ searchApprovalStatus: $('select[name=searchApprovalStatus]').val(), searchApprovalSubject: $('input[name=searchApprovalSubject]').val() }, - colNames: ['No.', 'id', '제목', '승인 유형', '승인 유형', '승인 상태','요청자', '생성일'], + colNames: ['No.', 'id', '제목', '승인 유형', '승인 유형', '승인 상태','요청자', '생성일', '예상완료일'], colModel: [ { name: 'rowNum', align: 'center', width: '30', sortable: false}, { name: 'id', align: 'center', key: true, hidden: true }, @@ -42,7 +50,8 @@ { name: 'approvalType', align: 'center', width: 80, hidden: true}, { name: 'approvalStatus.description', align: 'center', width: 80 }, { name: 'requester.userName', align: 'center', width: 100 }, - { name: 'createdDate', align: 'center', width: 120, formatter: 'date', formatoptions: { srcformat: 'ISO8601Long', newformat: 'Y-m-d H:i:s' } } + { name: 'createdDate', align: 'center', width: 120, formatter: 'date', formatoptions: { srcformat: 'ISO8601Long', newformat: 'Y-m-d H:i:s' } }, + { name: 'expectEndDate', align: 'center', width: 100, formatter: dateFormat}, ], jsonReader: { repeatitems: false @@ -134,8 +143,8 @@
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java index 8a72d2f..532ae3a 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java @@ -76,4 +76,10 @@ public class PortalApprovalManController extends BaseAnnotationController { portalApprovalManService.redeploy(id); return ResponseEntity.ok().build(); } + + @PostMapping(value = "/onl/apim/approval/portalApprovalMan.json", params = "cmd=UPDATE") + public ResponseEntity update(String id, String expectEndDate) { + portalApprovalManService.update(id, expectEndDate); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java index 99cf1b2..8210bd8 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java @@ -76,6 +76,16 @@ public class PortalApprovalManService extends BaseService { * 마스킹된 상세 정보 조회 */ public PortalApprovalUI selectDetail(String id) { + //2026.06.05 관리자가 승인요청을 조회시 심사중으로 상태 변경 + //APP 유형이고 REQUESTED 상태인 경우 관리자 조회 시 PROCESSING으로 변경 + approvalService.findById(id).ifPresent(approval -> { + if (approval.getApprovalType().equals(ApprovalType.APP) + && approval.getApprovalStatus() instanceof RequestedState) { + approval.setApprovalStatus(new ProcessingState()); + approvalService.save(approval); + } + }); + PortalApprovalUI result = getDetailWithMaskOption(id, false); if (result == null) { throw new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id); @@ -320,6 +330,13 @@ public class PortalApprovalManService extends BaseService { sendEvent(id, ApprovalEvent.DENY, options); } + public void update(String id, String expectEndDate) { + Approval approval = approvalService.findById(id) + .orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); + approval.setExpectEndDate(expectEndDate); + approvalService.save(approval); + } + public void redeploy(String id) { Map options = new HashMap<>(); Approval approval = approvalService.findById(id).orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java index 5df32b4..029d3f6 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java @@ -38,6 +38,8 @@ public class PortalApprovalUI { @DateTimeFormat(pattern = "yyyyMMddHHmmssSSS") private String approvalDate; + private String expectEndDate; + public String getApprovalTypeDescription() { return approvalType != null ? approvalType.getDescription() : ""; }