From f49e5ebfb014761ff301ea284ece68240d792c0b Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 6 Feb 2023 17:30:19 +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=B8=B0=EC=9D=BC=ED=86=B5=EC=A7=80=EC=84=9C,=20=EA=B8=B0?= =?UTF-8?q?=EC=9D=BC=EC=A1=B0=EC=84=9C=20=EA=B2=B0=EC=9E=AC=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=ED=9B=84=20=EC=A1=B0=EC=A0=95=EB=B6=80=EC=9E=A5=20?= =?UTF-8?q?=EA=B2=B0=EC=9E=AC=20=EC=9E=90=EB=8F=99=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=20-=20=EC=86=A1=EB=8B=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../kccadr/aprvl/service/AprvlMgrService.java | 2 +- .../service/impl/AprvlMgrServiceImpl.java | 7 +- .../aprvl/web/AprvlMgr202210Controller.java | 18 +++- .../adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml | 1 + .../adjPgrMgr/dlvinfo/dlvinfoDetail.jsp | 6 +- .../kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp | 28 +++-- .../dlvinfo/popup/dlvAdrNoListPop.jsp | 16 ++- .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 101 ++++++++---------- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 89 ++++++++++++++- .../advcAprvl/popup/advcAprvlReqPop50.jsp | 2 +- src/main/webapp/WEB-INF/web.xml | 2 +- 12 files changed, 192 insertions(+), 82 deletions(-) diff --git a/pom.xml b/pom.xml index 1534646d..c81ff168 100644 --- a/pom.xml +++ b/pom.xml @@ -613,7 +613,7 @@ install ${basedir}/target - kcc_adr_advc + ROOT diff --git a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java index 901bf54d..aa70c5c1 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java +++ b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java @@ -30,7 +30,7 @@ public interface AprvlMgrService { ) throws Exception; //조정사건결재저장 - 2022-10고도화 - int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO + String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO , String p_code_desc , String p_stat_cd , String p_adrHstryMgrSeq diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index 4add0fdb..ca19bc32 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -99,7 +99,7 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr } //조종사건결재 - public int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO + public String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO , String p_code_desc , String p_stat_cd , String p_adrHstryMgrSeq @@ -110,7 +110,7 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr AprvlMgrVO aprvlMgrVOtmp = aprvlMgrDAO.select4InsertAdrSbmtMgr(aprvlMgrVO); System.out.println("======================================202210==고도화 결재선 교체=="); - aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq()); //!!!!!!!!!!! + aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq()); if (aprvlMgrVOtmp.getSbmtId1()!=null && !"".equals(aprvlMgrVOtmp.getSbmtId1())) { @@ -264,7 +264,8 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr ); //adr_hstry_mgr에 값 넣기 - 끝 - return rs; + /*return rs;*/ + return aprvlMgrVO.getSbmtSeq(); } //조종사건수정 diff --git a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java index 0a51289c..8c4d7bbe 100644 --- a/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java +++ b/src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java @@ -376,12 +376,19 @@ public class AprvlMgr202210Controller { //조정사건결재 내용 추가해주기 //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 - i = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO - , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 - , "A070" //String p_stat_cd - , s_adrHstryMgrSeq - , adrSbmtLineMgrUsrVO +// i = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO +// , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 +// , "A070" //String p_stat_cd +// , s_adrHstryMgrSeq +// , adrSbmtLineMgrUsrVO +// ); + String sbmtSeq = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO + , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199 + , "A070" //String p_stat_cd + , s_adrHstryMgrSeq + , adrSbmtLineMgrUsrVO ); + if(!"".equals(sbmtSeq)) i = 1; //조정부가 있는지 확인 하자. aprvlMgrVO = aprvlMgrService.selectDetail(aprvlMgrVO); @@ -434,6 +441,7 @@ public class AprvlMgr202210Controller { modelAndView.addObject("status", "success"); + modelAndView.addObject("sbmtSeq", sbmtSeq); }catch(Exception ex) { modelAndView.addObject("status", "fail"); modelAndView.addObject("message", "결재선 생성 실패.-step0"); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml index fb4dc243..a44d509a 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml @@ -198,6 +198,7 @@ , REG_NM = #regNm# , LAST_UPDUSR_ID = #lastUpdusrId# , LAST_UPDT_PNTTM = SYS_DATETIME + , DLVRY_DOC_TY = #dlvryDocTy# WHERE ADR_SEQ = #adrSeq# AND ADR_SN = #adrSn# AND DLVRY_SEQ = #dlvrySeq# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp index 8b656508..68a4ab05 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp @@ -5,6 +5,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -203,7 +204,10 @@ 송달서류 -

+

+ +<%-- --%> +

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp index 2f4c845f..a57182f4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp @@ -170,16 +170,24 @@ - + + + - + + + - + + + - + + + @@ -187,13 +195,19 @@ - + + + - + + + - + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp index b8793394..6c666009 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp @@ -43,7 +43,12 @@ listForm.action = ""; listForm.submit(); } - + + function fncSearchAdrNo(){ + var listForm = document.listForm; + listForm.action = ""; + listForm.submit(); + } @@ -53,17 +58,18 @@ " /> " /> +

송달정보 사건번호 목록

- + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 824ac32f..7850b84d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -257,7 +257,9 @@ } //결재 팝업이후 처리 내용 - function fnc_aprvl_pop_ret(param){ + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); updtDntSbmt(); //SBMT_YN='Y'로 처리 //fncGoList(); //조정진행목록으로 } @@ -379,12 +381,11 @@ /* 기일통지서 승인요청 후 자동으로 조정부장 결재되도록 처리 */ function fncApprPass(){ - var data = { adrSeq : $("#adrSeq").val(), adrSn : $("#adrSn").val(), - sbmtSeq : $("#sbmtSeq").val(), /* 값받아와야함!! */ - sbmtTy : $("#sbmtTy").val(), /* 값받아와야함!! */ + sbmtSeq : $("#sbmtSeq").val(), + sbmtTy : $("#sbmtTy").val(), sbmtYn : 'Y' } @@ -408,56 +409,11 @@ }else if(returnData.result == 'SUCCESS'){ var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq; - if(statCd == '205010'){ //기일변경승인처리는 appr_yn 값을 변경하지 않는다. - updtDntApprYn('Y', s_adrHstryMgrSeq); - } + updtDntApprYn('Y', s_adrHstryMgrSeq); - var exportUrl = ""; - if(statCd == '205010'){ // 기일통지서 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do"; - - }else if(statCd == '302010'){ // 기일조서 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/drt/drtOzExportAjax.do"; - - }else if(statCd == '303010'){ // 조정권고안 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/arm/armOzExportAjax.do"; - //조정권고안 종결문서 번호 입력 - $('#closeDocTy').val("30"); - - }else if(statCd == '304010'){ // 조정조서 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/drtCtr/drtCtrOzExportAjax.do"; - //조정조서 종결문서 번호 입력 - $('#closeDocTy').val("40"); - - }else if(statCd == '305010'){ // 취하종결 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/ent/entOzExportAjax.do"; - //취하종결 문서 번호 입력 - $('#closeDocTy').val("50"); - - }else if(statCd == '306010'){ // 직권조정결정서 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/oad/oadOzExportAjax.do"; - //조정종결문서 번호 입력 - $('#closeDocTy').val("60"); - - }else if(statCd == '307010'){ // 불성립종결 통보서 승인 처리시 오즈리포트 Export 요청 - - exportUrl = "/kccadr/adjPgrMgr/crt/crtOzExportAjax.do"; - //불성립종결 통보서 종결문서 번호 입력 - $('#closeDocTy').val("70"); - - } - - if(exportUrl != ''){ - //오즈리포트 Export 처리 요청 - ozExportReport(exportUrl); - } - alert("승인되었습니다."); + exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do"; + ozExportReport(exportUrl); + alert("승인되었습니다."); } location.reload(); }, @@ -470,7 +426,7 @@ function updtDntApprYn(status , s_adrHstryMgrSeq ){ - + alert("function_updtDntApprYn in"); var data = new FormData(document.getElementById("detailForm")); data.append("apprYn" ,status); data.append("assHstrySeq" ,s_adrHstryMgrSeq); @@ -497,6 +453,33 @@ error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); } }); } + + function ozExportReport(exportUrl){ + + var data = new FormData(document.getElementById("detailForm")); + + $.ajax({ + type: "POST", + url: exportUrl, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success: function (returnData, status) { + console.log(returnData.result); + //alert(returnData.result); + if(returnData.result == 'SUCCESS'){ + + }else{ + alert(returnData.message); + } + }, + error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); } + }); + + } @@ -511,6 +494,16 @@ + + + + + + + + + + " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index 5dde7971..e94a9d55 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -406,9 +406,11 @@ } //결재 팝업이후 처리 내용 - function fnc_aprvl_pop_ret(param){ - //updtDntSbmt(); //SBMT_YN='Y'로 처리 - fncGoList(); //조정진행목록으로 + function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){ + $('#sbmtSeq').val(sbmtSeq); + $('#sbmtTy').val(sbmtTy); +// fncGoList(); //조정진행목록으로 + fncApprPass(); } function fncAppResultTyChg(){ @@ -447,6 +449,76 @@ var pop = document.pop; commonPopWindowopenForm("/kccadr/adjPgrMgr/drt/popup/addAgntPop.do", "750", "660", "addAgntPop", $('#pop')); } + + /* 기일조서 승인요청 후 자동으로 조정부장 결재되도록 처리 */ + 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; + + var exportUrl = ""; + + exportUrl = "/kccadr/adjPgrMgr/drt/drtOzExportAjax.do"; + //오즈리포트 Export 처리 요청 + ozExportReport(exportUrl); + alert("승인되었습니다."); + } + location.reload(); + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + + function ozExportReport(exportUrl){ + + var data = new FormData(document.getElementById("detailForm")); + + $.ajax({ + type: "POST", + url: exportUrl, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success: function (returnData, status) { + console.log(returnData.result); + //alert(returnData.result); + if(returnData.result == 'SUCCESS'){ + + }else{ + alert(returnData.message); + } + }, + error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); } + }); + + } @@ -462,6 +534,17 @@ + + + + + + + + + + + " /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp index fd38b97f..6b5d1430 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp @@ -862,7 +862,7 @@ function fn_save_aprvl() { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); //top.window.opener.parent.location.reload(); - top.window.opener.fnc_aprvl_pop_ret(); + top.window.opener.fnc_aprvl_pop_ret(returnData.sbmtSeq, $("#sbmtTyCd").val()); fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 6cce55eb..d795f97f 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -140,5 +140,5 @@ - +