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 15d6e2ef..a56407c0 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
@@ -1325,6 +1325,7 @@
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
+ AND T2.stat_cd LIKE LEFT(stat_cd, 4) + '90'
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 d1877e3f..b9dec0d7 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
@@ -337,8 +337,48 @@ $(document).ready(function(){
}
//결재 팝업 이후 처리내용
- function fnc_aprvl_pop_ret(param){
- location.reload();
+ function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){
+ $('#sbmtSeq').val(sbmtSeq);
+ $('#sbmtTy').val(sbmtTy);
+ fncApprPass();
+// location.reload();
+ }
+
+ /* 기일통지서 승인요청 후 자동으로 조정부장 결재되도록 처리 */
+ function fncApprPass(){
+ var data = {
+ adrSeq : $("#adrSeq").val(),
+ adrSn : $("#adrSn").val(),
+ sbmtSeq : $("#sbmtSeq").val(),
+ sbmtTy : $("#sbmtTy").val(),
+ sbmtYn : 'Y'
+ }
+
+ var statCd = $('#statCd').val();
+ $.ajax({
+ type: "POST",
+ url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do",
+ data: JSON.stringify(data),
+ dataType:'json',
+ async: false,
+ processData: false,
+ contentType: "application/json",
+ cache: false,
+ success: function (returnData, status) {
+ if(returnData.result == 'FAIL'){
+ if(returnData.message != ''){
+ alert(returnData.message);
+ }else{
+ alert("처리중 오류가 발생하였습니다.");
+ }
+ }else if(returnData.result == 'SUCCESS'){
+ var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq;
+
+ }
+ location.reload();
+ },
+ error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+ });
}
/* 워크플로우 */
@@ -771,6 +811,16 @@ $(document).ready(function(){
+