tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2022-11-24 11:23 되돌리기/워크플로우 내용 수정

Browse Source
This commit is contained in:
myname 2022-11-24 11:23:55 +09:00
parent a3221061a8
commit ec65c83517
10 changed files with 268 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml
View File

@ -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

4
src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml
View File

@ -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

67
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp
View File

@ -502,9 +502,24 @@ $(document).ready(function(){
$("#${list.menuId}").addClass("status01");
</script>
<c:set var="lastMenuId">${list.menuId}</c:set>
</c:if>
</c:forEach>
<!-- 최종값 찾기 -->
<c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq '6'}">
<!-- 사건접수진행시 체크-->
<c:if test="${list.menuId ne '400000'}">
<c:set var="passMenuId">${list.menuId}</c:set>
</c:if>
<c:if test="${list.menuId eq '400000'}">
<c:set var="lastMenuId">400000</c:set>
</c:if>
</c:if>
</c:forEach>
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
@ -550,6 +565,14 @@ $(document).ready(function(){
</c:if>
<!-- 취하신청 체크-->
<c:if test="${info.statCd eq 'C290' or info.statCd eq 'A320'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#C290").addClass("status02");
</script>
</c:if>
<!-- 취하종결 체크-->
<c:if test="${info.statCd eq '305010'}">
<script>
@ -559,22 +582,49 @@ $(document).ready(function(){
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${info.statCd eq '302010'}">
<!-- 조정성립 체크-->
<c:if test="${fn:indexOf(info.statCd,'3040')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
//$("#302050").addClass("status02");
$("#3040").addClass("status01");
</script>
</c:if>
<!-- 직권조정 체크-->
<c:if test="${fn:indexOf(info.statCd,'3060')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3060").addClass("status01");
$("#3061").removeClass("status01");
</script>
</c:if>
<!-- 취하신청 체크-->
<c:if test="${info.statCd eq 'C290' or info.statCd eq 'A320'}">
<!-- 조정권고안 체크-->
<c:if test="${fn:indexOf(info.statCd,'3030')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3030").addClass("status01");
</script>
</c:if>
<!-- 불성립 체크-->
<c:if test="${fn:indexOf(info.statCd,'3070')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3070").addClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${lastMenuId eq '400000'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#C290").addClass("status02");
$("#${passMenuId}").addClass("status02");
alert("#${passMenuId}");
</script>
</c:if>
<!-- 워크플로우용 스크립트 끝 -->
</head>
@ -612,7 +662,7 @@ $(document).ready(function(){
<div class="tab_cont on">
<div class="btn_wrap btn_layout05">
new button-코드 삭제 예정임/${info.statCd}/
(new button-코드 삭제 예정임/${info.statCd}/)
<div class="btn_left_box">
<c:choose>
@ -1012,8 +1062,9 @@ $(document).ready(function(){
</div>
old button-개발용 코드 노출 삭제 예정임/${info.statCd}/
<div class="btn_left_box" style="display:none;">
(old button-개발용 코드 노출 삭제 예정임/${info.statCd}/)
<c:choose>
<c:when test="${info.adrNo == null || info.adrNo == ''}">
<button type="button" class="btnType02" onclick="fncReg()">조정접수</button>

4
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp
View File

@ -470,8 +470,12 @@ $(document).ready(function() {
<button type="button" class="btnType02" onclick="sendDlvInfo();">송달정보입력</button>
</c:otherwise>
</c:choose>
<c:if test="${info.statCd ne '400000'}">
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>
<button type="button" class="btnType04" onclick="fncGoList()">취소</button>
</div>
</div>

50
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp
View File

@ -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 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />
@ -491,7 +538,8 @@
|| info.statCd eq '306050'
|| info.statCd eq '307090'
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('307010');">불성립종결통보서 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('307010');">불성립종결통보서 승인 요청</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('307010');">불성립종결통보서 승인 요청</button>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>

3
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp
View File

@ -155,7 +155,8 @@
success : function(returnData, status) {
if (returnData.result == 'success') {
alert("기일조서가 수정 되었습니다.");
fncGoList(); //상세
//fncGoList(); //상세
location.reload();
} else {
alert(returnData.message);
}

51
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp
View File

@ -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 @@
</script>
</head>
<body>
<!-- 고도화로 추가됨 -->
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${info.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn}" />" />
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<!-- 고도화로 추가됨 -->
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
</form>
<form id="dlvpop" name="dlvpop" method="post">
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${info.adrSn }" />" />
@ -568,7 +616,8 @@
info.statCd eq '302050'
|| info.statCd eq '306090'
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('306010');">직권조정결정서 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('306010');">직권조정결정서 승인 요청</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('306010');">직권조정결정서 승인 요청</button>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>

77
src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp
View File

@ -111,15 +111,31 @@
or list.menuId eq 'A260'
or list.menuId eq 'A320'
or list.menuId eq 'C150'
or list.menuId eq 'C290'
}">
<script>
//<!-- 조정진행워크플로우 체크 -->
$("#${list.menuId}").addClass("status01");
</script>
<c:set var="lastMenuId">${list.menuId}</c:set>
</c:if>
</c:forEach>
<!-- 최종값 찾기 -->
<c:forEach var="list" items="${list_mgr}" varStatus="status">
<c:if test="${fn:length(list.menuId) eq '6'}">
<!-- 사건접수진행시 체크-->
<c:if test="${list.menuId ne '400000'}">
<c:set var="passMenuId">${list.menuId}</c:set>
</c:if>
<c:if test="${list.menuId eq '400000'}">
<c:set var="lastMenuId">400000</c:set>
</c:if>
</c:if>
</c:forEach>
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
@ -138,8 +154,8 @@
<!-- 사건접수진행시 체크-->
<c:if test="${info.statCd eq '201010'
or info.statCd eq '201050'}">
<c:if test="${master.statCd eq '201010'
or master.statCd eq '201050'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#101050").addClass("status02");
@ -148,7 +164,7 @@
<!-- 조정부배당진행시 체크-->
<c:if test="${info.statCd eq '202010'}">
<c:if test="${master.statCd eq '202010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#202050").addClass("status02");
@ -157,7 +173,7 @@
<!-- 기일진행시 체크-->
<c:if test="${info.statCd eq '205010'}">
<c:if test="${master.statCd eq '205010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#205050").addClass("status02");
@ -165,8 +181,16 @@
</c:if>
<!-- 취하신청 체크-->
<c:if test="${master.statCd eq 'C290' or master.statCd eq 'A320'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#C290").addClass("status02");
</script>
</c:if>
<!-- 취하종결 체크-->
<c:if test="${info.statCd eq '305010'}">
<c:if test="${master.statCd eq '305010'}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#305050").addClass("status02");
@ -174,17 +198,52 @@
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${info.statCd eq '302010'}">
<!-- 조정성립 체크-->
<c:if test="${fn:indexOf(master.statCd,'3040')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
//$("#302050").addClass("status02");
$("#3040").addClass("status01");
</script>
</c:if>
<!-- 직권조정 체크-->
<c:if test="${fn:indexOf(master.statCd,'3060')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3060").addClass("status01");
$("#3061").removeClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${fn:indexOf(master.statCd,'3030')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3030").addClass("status01");
</script>
</c:if>
<!-- 불성립 체크-->
<c:if test="${fn:indexOf(master.statCd,'3070')>-1}">
<script>
//<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#3070").addClass("status01");
</script>
</c:if>
<!-- 조정권고안 체크-->
<c:if test="${lastMenuId eq '400000'}">
<script>
<!-- 조정진행워크플로우 현재 상태 체크 -->
$("#${passMenuId}").addClass("status02");
alert("#${passMenuId}");
</script>
</c:if>
<!-- 워크플로우용 스크립트 끝 -->
</head>
<body>
<form id="pop" name="pop" method="post">
<input type="hidden" id="adrSeq" name="adrSeq" value="<c:out value="${adjstReqStatusVO.adrSeq}" />" />
<input type="hidden" id="adrSn" name="adrSn" value="<c:out value="${adjstReqStatusVO.adrSn}" />" />

10
src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/workFlowJsp.jsp
View File

@ -27,15 +27,15 @@
<li>
<p id="302010">1차 기일 개최<img src="/kccadrPb/usr/image/workflow/nexticon4.png" alt="다음" class="nexticon_4"></p><img src="/kccadrPb/usr/image/workflow/nexticon3.png" alt="다음" class="nexticon_3">
<ul class="work_4">
<li id="309050"><p>조정성립</p></li>
<li><p>직권조정<img src="/kccadrPb/usr/image/workflow/nexticon5.png" alt="다음" class="nexticon_5"></p>
<li id="3040"><p>조정성립</p></li>
<li id="3060"><p>직권조정<img src="/kccadrPb/usr/image/workflow/nexticon5.png" alt="다음" class="nexticon_5"></p>
<ul class="work_5">
<li><p>이의신청</p></li>
<li id="3061"><p>이의신청</p></li>
</ul>
</li>
<li id="303050"><p>조정권고</p></li>
<li id="3030"><p>조정권고</p></li>
<li><p>쌍방수락여부 확인</p></li>
<li id="307050"><p>불성립종결</p></li>
<li id="3070"><p>불성립종결</p></li>
</ul>
</li>
<li>