From ec65c835171fd0d780f5782bca09a9eb202aadb8 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 24 Nov 2022 11:23:55 +0900 Subject: [PATCH 1/5] =?UTF-8?q?2022-11-24=2011:23=20=EB=90=98=EB=8F=8C?= =?UTF-8?q?=EB=A6=AC=EA=B8=B0/=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C?= =?UTF-8?q?=EC=9A=B0=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accdnt/ai/AdjustIncident_SQL_Mysql.xml | 8 +- .../adjcclt/AdjustConciliator_SQL_Mysql.xml | 4 +- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 87 ++++++++++++---- .../jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp | 8 +- .../jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp | 50 +++++++++- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 5 +- .../iam/internalApprovManageEndDetail.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 51 +++++++++- .../ars/tab/adjstReqStatusTabDetail.jsp | 99 +++++++++++++++---- .../jsp/web/kccadr/kccadrCom/workFlowJsp.jsp | 10 +- 10 files changed, 268 insertions(+), 56 deletions(-) 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차 기일 개최다음

    다음
      -

    • 조정성립

      • -

    • 직권조정다음

      +

    • 조정성립

      • +

    • 직권조정다음

        -

      • 이의신청

        • +

      • 이의신청

      • -

    • 조정권고

      • +

    • 조정권고

    • 쌍방수락여부 확인

      • -

    • 불성립종결

      • +

    • 불성립종결

  • From e4f55dba110a8e332ea5d2c03d8570d0e9e85866 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Thu, 24 Nov 2022 11:52:15 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC=20=EB=A0=88?= =?UTF-8?q?=EB=93=9C=EB=A7=88=EC=9D=B8=20#2925=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20css=20=EB=B6=84=EB=A6=AC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/adm/css/content.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index ac330308..fe8b45b7 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -451,9 +451,9 @@ table select+button{vertical-align: middle;} .nexticon_5{position: absolute; top: 22px; left: 215px;} .work_flow_wrap.off .work_cont{height: 0; padding: 0 25px; margin: 0; transition: all 0.5s ease;} -.work_cont .status01 p{border: 1px solid #ea5404; color: #ea5404;} +.work_cont .status01 > p{border: 1px solid #ea5404; color: #ea5404;} .work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;} -.work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} +.work_cont .status02 > p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} .work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} /* //워크플로우 */ From 2777f47d318d717f649d152ec7df309b83f6c6c0 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 25 Nov 2022 10:19:06 +0900 Subject: [PATCH 3/5] =?UTF-8?q?2022-11-25=2010:18=20=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=83=81=EC=84=B8=20=EB=85=B8=EC=B6=9C=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=88=98=EC=A0=95=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 46 ++++++++++++++--- .../jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 50 ++++++++++++++++++- .../jsp/kccadr/adjPgrMgr/arm/armReg.jsp | 2 +- 3 files changed, 89 insertions(+), 9 deletions(-) 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 d39cfbb0..81cdbdee 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 @@ -510,7 +510,8 @@ $(document).ready(function(){ - + ${list.menuId} @@ -616,12 +617,43 @@ $(document).ready(function(){ - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index 4e39547a..638cf281 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -181,6 +181,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')); } @@ -263,6 +300,16 @@ + + + " /> + " /> + " /> + + + + +
    " /> " /> @@ -574,7 +621,8 @@ info.statCd eq '302050' || info.statCd eq '303090' }"> - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp index fefd9f57..7ac84916 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp @@ -286,7 +286,7 @@
    - +
    From 803246c0e322bcd13c0b803d3a555e6fd0813e90 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 25 Nov 2022 11:35:18 +0900 Subject: [PATCH 4/5] =?UTF-8?q?2022-11-25=2011:34=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=EC=97=90=20,=20=EB=93=A4=EC=96=B4=EA=B0=80=EC=84=9C=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=98=A4=EB=A5=98=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 338 +++++++++--------- 1 file changed, 175 insertions(+), 163 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 0a77ca7f..0dd54e4d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -3,7 +3,6 @@ package kcc.kccadr.adjPgrMgr.apm.web; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -353,169 +351,183 @@ public class ApmController { @RequestMapping(value = "apmTab0.do") public String apmTab0(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception { - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - - // 조정사건일반 - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - model.addAttribute("info", info); - - - String adrAdmMemoYn = "N"; - //조정조사관 의견 버튼 노출 여부 - if(userId.equals(info.getAdrAdmId())) { - adrAdmMemoYn = "Y"; - } - - model.addAttribute("adrAdmMemoYn", adrAdmMemoYn); - - //피신청인 이름 리스트로 구분처리 - String[] resPonDentNm = info.getResPonDentNm().split(", "); - - //피신청인 ID 리스트로 구분처리 - String[] resPonDentId = info.getResPonDentId().split(", "); - - //피신청인 대리인정보 처리 - String[] resPonDentDNm = {""}; //피신청 대리인 이름 - String[] resPonDentDId = {""}; //피신청 대리인 ID - String[] rpplResPonddSeq = {""}; //대리인의 피신청인 ID - if(StringUtil.isNotEmpty(info.getResPonDentDNm())) { + try { + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - resPonDentDNm = info.getResPonDentDNm().split(", "); - resPonDentDId = info.getResPonDentDId().split(", "); - rpplResPonddSeq = info.getRpplRespddSeq().split(", "); - - } - - - //피신청인 이름, ID, 피신청인 대리인 이름, ID 값 리스트로 합치기 2022.01.17 - List rpplRepondList = new ArrayList(); - for(int i=0; i apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO); - List apmChgDateList = apmService.selectApmChgDateConfirmInfoList202211(cmmVO); - - model.addAttribute("apmChgDateList", apmChgDateList); - - // 사용자 조정기일 변경신청 건이 있는지 확인 - List apmChgDateCnt = apmService.selectApmChgDateInfoCnt(cmmVO); - model.addAttribute("apmChgDateCnt", apmChgDateCnt); + // 조정사건일반 + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + model.addAttribute("info", info); + + + String adrAdmMemoYn = "N"; + //조정조사관 의견 버튼 노출 여부 + if(userId.equals(info.getAdrAdmId())) { + adrAdmMemoYn = "Y"; + } + + model.addAttribute("adrAdmMemoYn", adrAdmMemoYn); + + //피신청인 이름 리스트로 구분처리 + String[] resPonDentNm = info.getResPonDentNm().split(", "); + + //피신청인 ID 리스트로 구분처리 + String[] resPonDentId = info.getResPonDentId().split(", "); + + //피신청인 대리인정보 처리 + String[] resPonDentDNm = {""}; //피신청 대리인 이름 + String[] resPonDentDId = {""}; //피신청 대리인 ID + String[] rpplResPonddSeq = {""}; //대리인의 피신청인 ID + if(StringUtil.isNotEmpty(info.getResPonDentDNm())) { + + resPonDentDNm = info.getResPonDentDNm().split(", "); + resPonDentDId = info.getResPonDentDId().split(", "); + rpplResPonddSeq = info.getRpplRespddSeq().split(", "); + + } + + + //피신청인 이름, ID, 피신청인 대리인 이름, ID 값 리스트로 합치기 2022.01.17 + List rpplRepondList = new ArrayList(); + for(int i=0; i apmChgDateCntWithSn = apmService.selectApmChgDateInfoCntWithSn(cmmVO); - model.addAttribute("apmChgDateCntWithSn", apmChgDateCntWithSn); - - //최종 차수 정보 - //String adrMaxSn = apmChgDateList.get(0).getAdrSn(); - //model.addAttribute("adrMaxSn", adrMaxSn); - - - //기일조서값 - DrtVO drtVO = new DrtVO(); - drtVO.setAdrSeq(cmmVO.getAdrSeq()); - drtVO.setAdrSn(cmmVO.getAdrSn()); - drtVO = drtService.selectAdrPrtclMgr(drtVO); - model.addAttribute("drtInfo", drtVO); - - //이의신청 - OjctVO ojctVO = new OjctVO(); - ojctVO.setAdrSeq(cmmVO.getAdrSeq()); - int ojctCnt = ojctService.selectOjctListCount(ojctVO); - model.addAttribute("ojctCnt", ojctCnt); - - //경정조서 - ApmCorrectVO apmCorrectVO = new ApmCorrectVO(); - apmCorrectVO.setAdrSeq(cmmVO.getAdrSeq()); - model.addAttribute("rpplChgList", apmService.selectRpplChgList(apmCorrectVO)); - - //취하신청 정보 - EntVO entVO = new EntVO(); - entVO.setAdrSeq(cmmVO.getAdrSeq()); - entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); - EntVO resultEntInfo = entService.selectEntInfo(entVO); - - model.addAttribute("resultEntInfo", resultEntInfo); - - //취하신청 등록 여부 - EntVO entVO_2 = new EntVO(); - entVO_2.setAdrSeq(cmmVO.getAdrSeq()); - entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); - EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2); - - model.addAttribute("resultEntInfo_2", resultEntInfo_2); - - - - //확정증명원 유무 - CloseVO closeVO = new CloseVO(); - closeVO.setAdrSeq(cmmVO.getAdrSeq()); - closeVO.setAdrSn(cmmVO.getAdrSn()); - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); - model.addAttribute("resultCloseDoc", cmmService.selectCloseDoc(closeVO)); - - //진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기 - model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq())); - - /*//adr_mgr_detail 첨부파일 불러오기 - FileVO fileVO = new FileVO(); - - //조정신청 첨부파일 리스트 불러오기. - String rpplMgrAtchFileId = resultAdjReqMgrOffLine.getAtchFileId(); - fileVO.setAtchFileId(rpplMgrAtchFileId); - resultAdjReqMgrOffLine.setRpplMgrAtchFileId(rpplMgrAtchFileId); - List rpplMgrAtchFileList = fileService.selectFileInfs(fileVO); - model.addAttribute("rpplMgrAtchFileList", rpplMgrAtchFileList);*/ - - - //이력값 - 시작 - AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); - adrHstryMgrVO.setAdrSeq(cmmVO.getAdrSeq()); - - model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); - //이력값 - 끝 - - AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); - - adjReqMgrVO.setAdrSeq(cmmVO.getAdrSeq()); - - List person = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO); - decryptInfomation(person ,null); - model.addAttribute("person", person); + //이름에 ,를 넣는경우 발생하는 오류를 막기위한 예외처리 추가 + try { + respNm = resPonDentNm[i]; //피신청인 이름 + respId = resPonDentId[i]; //피신청인 ID + }catch(Exception ex) { + ex.printStackTrace(); + } + + + PgrCmmVO temp = new PgrCmmVO(); + temp.setResPonDentNm(respNm); + temp.setResPonDentId(respId); + + //등록된 대리인 정보가 있으면 처리 + if(StringUtil.isNotEmpty(info.getResPonDentDNm())) { + + for(int j=0; j < rpplResPonddSeq.length; j++) { + + String rpplResSeq = rpplResPonddSeq[j]; //대리인의 피신청인 ID + String respdNm = resPonDentDNm[j]; //피신청 대리인 이름 + String respdId = resPonDentDId[j]; //피신청 대리인 ID + + if(respId.equals(rpplResSeq)) { + + temp.setResPonDentDNm(respdNm); + temp.setResPonDentDId(respdId); + temp.setRpplRespddSeq(rpplResSeq); //대리인의 피신청인 ID (어떤 피신청인의 대리인인지 구분하기 위해) + + } + + } + + } + + rpplRepondList.add(temp); + + } + + model.addAttribute("rpplRepondList", rpplRepondList); + + // 조정기일 - 등록된 조정기일 중 조정위원 승인이 완료된 정보를 모두 불러옴(기일 승인이 완료된 건만 불러옴) + //List apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO); + List apmChgDateList = apmService.selectApmChgDateConfirmInfoList202211(cmmVO); + + model.addAttribute("apmChgDateList", apmChgDateList); + + // 사용자 조정기일 변경신청 건이 있는지 확인 + List apmChgDateCnt = apmService.selectApmChgDateInfoCnt(cmmVO); + model.addAttribute("apmChgDateCnt", apmChgDateCnt); + + // 사용자 조정기일 변경신청 건이 있는지 확인 with 차수(해당 차수의 변경신청 건이 있는지 확인) + List apmChgDateCntWithSn = apmService.selectApmChgDateInfoCntWithSn(cmmVO); + model.addAttribute("apmChgDateCntWithSn", apmChgDateCntWithSn); + + //최종 차수 정보 + //String adrMaxSn = apmChgDateList.get(0).getAdrSn(); + //model.addAttribute("adrMaxSn", adrMaxSn); + + + //기일조서값 + DrtVO drtVO = new DrtVO(); + drtVO.setAdrSeq(cmmVO.getAdrSeq()); + drtVO.setAdrSn(cmmVO.getAdrSn()); + drtVO = drtService.selectAdrPrtclMgr(drtVO); + model.addAttribute("drtInfo", drtVO); + + //이의신청 + OjctVO ojctVO = new OjctVO(); + ojctVO.setAdrSeq(cmmVO.getAdrSeq()); + int ojctCnt = ojctService.selectOjctListCount(ojctVO); + model.addAttribute("ojctCnt", ojctCnt); + + //경정조서 + ApmCorrectVO apmCorrectVO = new ApmCorrectVO(); + apmCorrectVO.setAdrSeq(cmmVO.getAdrSeq()); + model.addAttribute("rpplChgList", apmService.selectRpplChgList(apmCorrectVO)); + + //취하신청 정보 + EntVO entVO = new EntVO(); + entVO.setAdrSeq(cmmVO.getAdrSeq()); + entVO.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo = entService.selectEntInfo(entVO); + + model.addAttribute("resultEntInfo", resultEntInfo); + + //취하신청 등록 여부 + EntVO entVO_2 = new EntVO(); + entVO_2.setAdrSeq(cmmVO.getAdrSeq()); + entVO_2.setApprYn(KccadrConstants.ADR_CNCL_DROP_REQ); + EntVO resultEntInfo_2 = entService.selectEntInfo_2(entVO_2); + + model.addAttribute("resultEntInfo_2", resultEntInfo_2); + + + + //확정증명원 유무 + CloseVO closeVO = new CloseVO(); + closeVO.setAdrSeq(cmmVO.getAdrSeq()); + closeVO.setAdrSn(cmmVO.getAdrSn()); + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); + model.addAttribute("resultCloseDoc", cmmService.selectCloseDoc(closeVO)); + + //진행상태가 결재요청상태 일때 결재결재선 중 결재 진행중인 사람 불러오기 + model.addAttribute("sbmtStatus",apmService.selectSbmtIngStatus(cmmVO.getAdrSeq())); + + /*//adr_mgr_detail 첨부파일 불러오기 + FileVO fileVO = new FileVO(); + + //조정신청 첨부파일 리스트 불러오기. + String rpplMgrAtchFileId = resultAdjReqMgrOffLine.getAtchFileId(); + fileVO.setAtchFileId(rpplMgrAtchFileId); + resultAdjReqMgrOffLine.setRpplMgrAtchFileId(rpplMgrAtchFileId); + List rpplMgrAtchFileList = fileService.selectFileInfs(fileVO); + model.addAttribute("rpplMgrAtchFileList", rpplMgrAtchFileList);*/ + + + //이력값 - 시작 + AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); + adrHstryMgrVO.setAdrSeq(cmmVO.getAdrSeq()); + + model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); + //이력값 - 끝 + + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + + adjReqMgrVO.setAdrSeq(cmmVO.getAdrSeq()); + + List person = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO); + decryptInfomation(person ,null); + model.addAttribute("person", person); + }catch(Exception ex) { + ex.printStackTrace(); + } + return "/kccadr/adjPgrMgr/apm/apmTab0"; } From 27b58893f3b099823ac08ccb1ec5d546e67fc038 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 25 Nov 2022 12:19:31 +0900 Subject: [PATCH 5/5] =?UTF-8?q?2022-11-25=2012:19=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=EC=97=90=20=EC=B7=A8=ED=95=98?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EC=B2=B4=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 4 ++-- .../webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 81cdbdee..699898b3 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 @@ -575,10 +575,10 @@ $(document).ready(function(){ - + 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 e8cf6d23..2e7088d4 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 @@ -47,7 +47,7 @@

  • 기일변경

  • 변론서 및 답변서

    • -

  • 취하신청

    다음

    취하종결

    • +

  • 취하신청

    다음

    취하종결

    • \ No newline at end of file