diff --git a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml index a46af110..72952962 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml @@ -36,7 +36,7 @@ ORDER BY S1.FRST_REGIST_PNTTM ) AS RES_PON_DENT_NM , ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM + , ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM ,FRST_REGIST_PNTTM ,FRST_REGISTER_ID ,LAST_UPDT_PNTTM @@ -81,7 +81,7 @@ ORDER BY S1.FRST_REGIST_PNTTM ) AS RES_PON_DENT_NM , ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM + , ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM ,REJECT_CN ,FRST_REGIST_PNTTM ,FRST_REGISTER_ID @@ -240,7 +240,7 @@ ORDER BY S1.FRST_REGIST_PNTTM ) AS RES_PON_DENT_NM , ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM + , ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM ,REJECT_CN ,FRST_REGIST_PNTTM ,FRST_REGISTER_ID @@ -783,7 +783,7 @@ ORDER BY S1.FRST_REGIST_PNTTM ) AS RES_PON_DENT_NM , ( SELECT GROUP_CONCAT(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30' GROUP BY S1.adr_seq) AS DEPU_TY_NMS - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM + , ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM ,FRST_REGIST_PNTTM ,FRST_REGISTER_ID ,LAST_UPDT_PNTTM diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml index 003ea6b1..e4d78381 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml @@ -170,8 +170,8 @@ GROUP BY S1.adr_seq ORDER BY S1.FRST_REGIST_PNTTM ) AS RES_PON_DENT_NM - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30') AS DEPU_TY_NM - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM + , ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30') AS DEPU_TY_NM + , ( SELECT max(RPPL_NM) FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM ,FRST_REGIST_PNTTM ,FRST_REGISTER_ID ,LAST_UPDT_PNTTM 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 c09ae985..d39cfbb0 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 @@ -502,9 +502,24 @@ $(document).ready(function(){ $("#${list.menuId}").addClass("status01"); ${list.menuId} + - + + + + + + + ${list.menuId} + + + + 400000 + + + + - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + @@ -612,7 +662,7 @@ $(document).ready(function(){
- new button-코드 삭제 예정임/${info.statCd}/ + (new button-코드 삭제 예정임/${info.statCd}/)
@@ -1012,8 +1062,9 @@ $(document).ready(function(){
- old button-개발용 코드 노출 삭제 예정임/${info.statCd}/ + -
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp index ccdb9d43..29f10baf 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp @@ -175,6 +175,43 @@ }); } + function fnc_aprvl_pop(param){ + var pop = document.pop; + pop.sbmtTyCd.value=param; + + //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + + if (param=='201010'){ //20, 30, 40 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + //commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + }else if (param=='202010'){ //30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop')); + + }else if (param=='204010' + || param=='205010' + || param=='302010' + || param=='303010' + || param=='304010' + || param=='305010' + || param=='306010' + || param=='307010' + ){ //50 + //204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop')); + + }else if (param=='309010'){ //50, 20, 30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + } + } + + //결재 팝업 이후 처리내용 + function fnc_aprvl_pop_ret(param){ + //location.reload(); + fncGoList('list'); //조정진행목록으로 + } + function sendDlvInfoPop() { commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } @@ -251,6 +288,16 @@ + +
+ " /> + " /> + " /> + + + + +
" /> " /> @@ -491,7 +538,8 @@ || info.statCd eq '306050' || info.statCd eq '307090' }"> - + + 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 75fb33ab..1c852647 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 @@ -154,8 +154,9 @@ cache : false, success : function(returnData, status) { if (returnData.result == 'success') { - alert("기일조서가 수정 되었습니다."); - fncGoList(); //상세 + alert("기일조서가 수정 되었습니다."); + //fncGoList(); //상세 + location.reload(); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp index 79d6f0a6..8214b989 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp @@ -58,7 +58,7 @@ function tabPageLoad(idx) { $('.tab_cont .btn_wrap .area_left').find('button').remove('button'); $('.tab_cont .btn_layout05').find('button').remove('button'); $('.tab_cont .tb_tit').find('button').remove('button'); - //btn_wrap btn_layout05 + //btn_wrap btn_layout05 }); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp index bee7bdd1..464a5eb8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp @@ -186,6 +186,44 @@ }); } + + function fnc_aprvl_pop(param){ + var pop = document.pop; + pop.sbmtTyCd.value=param; + + //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + + if (param=='201010'){ //20, 30, 40 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + //commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + }else if (param=='202010'){ //30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop')); + + }else if (param=='204010' + || param=='205010' + || param=='302010' + || param=='303010' + || param=='304010' + || param=='305010' + || param=='306010' + || param=='307010' + ){ //50 + //204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop')); + + }else if (param=='309010'){ //50, 20, 30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + } + } + + //결재 팝업 이후 처리내용 + function fnc_aprvl_pop_ret(param){ + //location.reload(); + fncGoList('list'); //조정진행목록으로 + } + function sendDlvInfoPop() { commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } @@ -270,6 +308,16 @@ + + + " /> + " /> + " /> + + + + +
" /> " /> @@ -568,7 +616,8 @@ info.statCd eq '302050' || info.statCd eq '306090' }"> - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp index 0ecf9bf4..2360076f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp @@ -111,15 +111,31 @@ or list.menuId eq 'A260' or list.menuId eq 'A320' or list.menuId eq 'C150' + or list.menuId eq 'C290' }"> ${list.menuId} + - - + + + + + + + + ${list.menuId} + + + + 400000 + + + + - + - + - + - + - - + + + + + + + - + - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - " /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp index c7e89975..e8cf6d23 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp @@ -27,15 +27,15 @@

  • 1차 기일 개최다음

    다음
      -

    • 조정성립

      • -

    • 직권조정다음

      +

    • 조정성립

      • +

    • 직권조정다음

        -

      • 이의신청

        • +

      • 이의신청

      • -

    • 조정권고

      • +

    • 조정권고

    • 쌍방수락여부 확인

      • -

    • 불성립종결

      • +

    • 불성립종결