2022-11-15 18:22 되돌리기 작업

This commit is contained in:
myname 2022-11-15 18:22:34 +09:00
parent fb4bd274ad
commit 115865d864
14 changed files with 281 additions and 20 deletions

View File

@ -85,6 +85,10 @@ public interface ApmService {
//조정기일 날짜 장소, 주소 정보 불러오기 - 해당 사건에 등록된 모든 차수의 기일정보를 불러옴(조정위원(부서장) 승인완료 된것만 불러옴)
List<PgrCmmVO> selectApmChgDateConfirmInfo(PgrCmmVO cmmVO) throws Exception;
//조정기일 날짜 장소, 주소 정보 불러오기 - 해당 사건에 등록된 모든 차수의 기일정보를 불러옴(조정위원(부서장) 승인완료 된것만 불러옴)
// 차수별로 승인된 최종 값의 정보를 가져온다.
List<PgrCmmVO> selectApmChgDateConfirmInfoList202211(PgrCmmVO cmmVO) throws Exception;
// 사용자 차수별 기일변경 신청건수 조회
List<PgrCmmVO> selectApmChgDateInfoCnt(PgrCmmVO cmmVO) throws Exception;

View File

@ -172,7 +172,13 @@ public class ApmDAO extends EgovAbstractDAO {
return (List<PgrCmmVO>) list("Apm.selectApmChgDateConfirmInfo", cmmVO);
}
@SuppressWarnings("unchecked")
public List<PgrCmmVO> selectApmChgDateConfirmInfoList202211(PgrCmmVO cmmVO) throws Exception{
return (List<PgrCmmVO>) list("Apm.selectApmChgDateConfirmInfoList202211", cmmVO);
}
@SuppressWarnings("unchecked")
public List<PgrCmmVO> selectApmChgDateInfoCnt(PgrCmmVO cmmVO) throws Exception{

View File

@ -541,6 +541,11 @@ public class ApmServiceImpl implements ApmService {
return apmDAO.selectApmChgDateConfirmInfo(cmmVO);
}
public List<PgrCmmVO> selectApmChgDateConfirmInfoList202211(PgrCmmVO cmmVO) throws Exception{
return apmDAO.selectApmChgDateConfirmInfoList202211(cmmVO);
}
public List<PgrCmmVO> selectApmChgDateInfoCnt(PgrCmmVO cmmVO) throws Exception{
return apmDAO.selectApmChgDateInfoCnt(cmmVO);

View File

@ -424,7 +424,9 @@ public class ApmController {
model.addAttribute("rpplRepondList", rpplRepondList);
// 조정기일 - 등록된 조정기일 조정위원 승인이 완료된 정보를 모두 불러옴(기일 승인이 완료된 건만 불러옴)
List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO);
//List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfo(cmmVO);
List<PgrCmmVO> apmChgDateList = apmService.selectApmChgDateConfirmInfoList202211(cmmVO);
model.addAttribute("apmChgDateList", apmChgDateList);
// 사용자 조정기일 변경신청 건이 있는지 확인

View File

@ -52,6 +52,7 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
private String apprYn; // 결재여부
private String appSeq; // 조정기일일련번호
private String appSeqMin; // 조정기일일련번호 최소값(해당 차수에서 최초로 성공한 (?))
private String appSbmtYn; // 변경제출여부
private String appChgCn; //기일변경사유
@ -1164,6 +1165,14 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable {
public void setAssSeq2SelectYn(String assSeq2SelectYn) {
this.assSeq2SelectYn = assSeq2SelectYn;
}
public String getAppSeqMin() {
return appSeqMin;
}
public void setAppSeqMin(String appSeqMin) {
this.appSeqMin = appSeqMin;
}

View File

@ -384,6 +384,9 @@ public class InternalApprovManageController {
) {
//사건 종결인 경우는 바로 조정종결 처리를 한다.
arv.setStatCd("400000"); // 최종 변경 상태값
s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); //코드값도 새로운 값으로 한번더 따야한다.
kccadrMgrUdtService.updateAdrMgrUdt(arv
, s_adrHstryMgrSeq
);

View File

@ -933,6 +933,114 @@
</select>
<select id="Apm.selectApmChgDateConfirmInfoList202211" parameterClass="PgrCmmVO" resultClass="PgrCmmVO">
SELECT COUNT(1) OVER() AS totCnt,
adrSeq,
adrSn,
appSeq,
adrAdmId,
rpplSeq,
appChgCn,
appChgPhone,
appChgCelnum,
sbmtYn,
sbmtDe,
usrCi,
appDeDay,
appDeTime,
appPlace,
appPlaceAddr,
apprYn,
apprDe,
apprCn,
appPlaceTy,
appPlaceAddrTy,
appPlaceInfo,
appPlaceAddrInfo,
atchFileId,
frstRegistPnttm,
frstRegisterId,
lastUpdtPnttm,
lastUpdusrId,
statCd,
appResultTy,
appSeqMin
FROM (
SELECT a.adr_seq AS adrSeq,
a.adr_sn AS adrSn,
a.app_seq AS appSeq,
a.adr_admin_id AS adrAdmId,
a.rppl_seq AS rpplSeq,
a.app_chg_cn AS appChgCn,
a.app_chg_phone AS appChgPhone,
a.app_chg_celnum AS appChgCelnum,
a.sbmt_yn AS sbmtYn,
TO_CHAR ( a.sbmt_de, 'YYYY/MM/DD' ) AS sbmtDe,
a.usr_ci AS usrCi,
TO_CHAR ( a.app_de, 'YYYY/MM/DD' ) AS appDeDay,
TO_CHAR ( a.app_de, 'HH24:MI' ) AS appDeTime,
a.app_place AS appPlace,
a.app_place_addr AS appPlaceAddr,
DECODE ( a.app_place_ty, '99', REPLACE(a.app_place,'|',' '),
(SELECT code_nm
FROM lettccmmndetailcode
WHERE code_id='CC020'
AND code =a.app_place_ty
)
) AS appPlaceInfo,
DECODE ( a.app_place_addr_ty, '99', REPLACE(a.app_place_addr,'|',' ') ,
(SELECT code_nm
FROM lettccmmndetailcode
WHERE code_id='CC021'
AND code =a.app_place_addr_ty
)
) AS appPlaceAddrInfo,
a.appr_yn AS apprYn,
a.appr_de AS apprDe,
a.appr_cn AS apprCn,
a.app_place_ty AS appPlaceTy,
a.app_place_addr_ty AS appPlaceAddrTy,
a.atch_file_id AS atchFileId,
a.frst_regist_pnttm AS frstRegistPnttm,
a.frst_register_id AS frstRegisterId,
a.last_updt_pnttm AS lastUpdtPnttm,
a.last_updusr_id AS lastUpdusrId,
b.stat_cd AS statCd,
d.app_result_ty AS appResultTy
, a1.app_seq_min AS appSeqMin
FROM (
SELECT a0.adr_seq, a0.adr_sn
, MAX(a0.app_seq) app_seq
, MIN(a0.app_seq) app_seq_min
FROM adr_app_mgr a0
WHERE a0.adr_seq = #adrSeq#
AND a0.adr_admin_id IS NOT NULL
AND a0.sbmt_yn = 'Y'
AND a0.appr_yn = 'Y'
GROUP BY a0.adr_seq, a0.adr_sn
) a1
, adr_app_mgr a
LEFT JOIN adr_mgr_master b
ON a.adr_seq = b.adr_seq
LEFT OUTER JOIN adr_mgr_detail c
ON a.adr_seq = c.adr_seq
LEFT OUTER JOIN adr_prtcl_mgr d
ON a.adr_seq = d.adr_seq
AND a.adr_sn = d.adr_sn
WHERE a1.adr_seq=a.adr_seq
AND a1.adr_sn=a.adr_sn
AND a1.app_seq=a.app_seq
)
AA
ORDER BY AA.adrSn DESC
</select>
<!-- 대국민 사용자가 등록한 기일변경 신청건 조회 -->
<select id="Apm.selectApmChgDateInfoCnt" parameterClass="PgrCmmVO" resultClass="PgrCmmVO">

View File

@ -673,7 +673,9 @@ $(document).ready(function(){
(not empty apmChgDateList
|| info.statCd== KccadrConstants.ADR_DEPT_SLCT_COMP)
}">
<button type="button" class="btnType02" onclick="fncGo('dnt/dntDetail.do')">기일지정상세</button>
<button type="button" class="btnType02" onclick="fncGo('dnt/dntDetail.do')">기일지정상세</button>
</c:if>
@ -732,19 +734,31 @@ $(document).ready(function(){
<br/>${KccadrConstants.ADR_APP_CHG_APPR}
<br/>/${apmChgDateList}/1
<br/>/${drtInfo}/2
-->
<br/>/${drtInfo}/2 - 기일조서값
-->
<!-- 기일변경승인(204050) 또는 기일승인(204050) 인 경우는 기일변경 내용보기 버튼, 취하종결(305010~305090)은 상시 프로세스이므로 제외-->
<!-- public static final String ADR_APP_NTC_APPR = "205050"; // 기일통지서승인(211104 추가)
30 종결 문서 작성 코드
public static final String ADR_CNCLTBS_APPR_REQ = "305010"; // 취하종결통보서 결재요청
public static final String ADR_CNCLTBS_RETN = "305090"; // 취하종결통보서 반려
public static final String ADR_APP_CHG_APPR = "204050"; // 기일변경승인
-->
<c:if test="${
(info.statCd== KccadrConstants.ADR_APP_NTC_APPR || fn:indexOf(info.statCd,'30') > -1)
(info.statCd== KccadrConstants.ADR_APP_NTC_APPR
|| info.statCd== KccadrConstants.ADR_APP_CHG_APPR
|| fn:indexOf(info.statCd,'30') > -1
)
&&
(info.statCd < KccadrConstants.ADR_CNCLTBS_APPR_REQ || info.statCd > KccadrConstants.ADR_CNCLTBS_RETN)
&&
(not empty apmChgDateList || not empty drtInfo)
&&
(info.statCd != KccadrConstants.ADR_APP_CHG_APPR)
(not empty apmChgDateList || not empty drtInfo)
}">
<!--
기일변경승인은 왜 빠지지?
&&
(info.statCd != KccadrConstants.ADR_APP_CHG_APPR)
-->
<%-- <c:if test="${(info.statCd== KccadrConstants.ADR_APP_NTC_APPR
|| info.statCd== KccadrConstants.ADR_APP_CHG_APPR
|| fn:indexOf(info.statCd,'30') > -1)
@ -858,8 +872,9 @@ $(document).ready(function(){
|| info.statCd== KccadrConstants.ADR_BSRTBS_APPR_COMP
|| info.statCd== KccadrConstants.ADR_CLOSE_RETN
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('309010');">종결결재</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재(새로운결재선)</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('309010');">종결결재</button> -->
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재(새로운결재선)</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재</button>
</c:if>
<!-- 직권조정결정서 확인 완료 후 -->
@ -886,8 +901,9 @@ $(document).ready(function(){
<c:choose>
<c:when test="${not empty resultCloseDoc}">
<!-- <button type="button" class="btnType02" onclick="fncGo('cfrm/cfrmDetail.do');">확정증명원</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('309010');">종결결재</button>
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재(새로운결재선)</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('309010');">종결결재</button> -->
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재(새로운결재선)</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('309010');">종결결재</button>
</c:when>
<c:when test="${ojctCnt == 0 && info.closeDocTy ne '70'}">
<button type="button" class="btnType02" onclick="fncGo('cfrm/cfrmReg.do');">확정증명원 등록</button>

View File

@ -205,6 +205,7 @@ function fncCancelDo(p_a, p_b){
and list.menuId*1 ne 306050
and list.menuId*1 ne 307050
and list.menuId*1 ne 309050
and list.menuId*1 ne 400000
}"><!--
아래 번호는 skip 대상임
@ -240,9 +241,10 @@ function fncCancelDo(p_a, p_b){
-->
<td style="text-align:left;">
<p>
<c:out value="${list.aCodeNm}" />
<c:out value="${list.aCodeNm}" />
<c:if test="${empty list.aCodeNm}">
<c:out value="${list.eCodeNm}" />
</c:if>
</p>
@ -261,7 +263,8 @@ function fncCancelDo(p_a, p_b){
<p>
<c:if test="${lastCount eq status.count}">
<a href="javascript:fncCancelDo('${list.adrSeq}','${list.adrHstryMgrSeq}');">되돌리기</a>${list.menuId}
<a href="javascript:fncCancelDo('${list.adrSeq}','${list.adrHstryMgrSeq}');">되돌리기</a>
<%-- ${list.menuId} --%>
</c:if>

View File

@ -886,7 +886,7 @@
<!-- 기일조서결재반려(302090) 또는 기일조서결재반려(302090) 인 경우에만 결재요청이 보인다. -->
<c:if test="${info.statCd eq '302090' or info.statCd*1 lt 300000}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('302010');">결재요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('302010');">결재요청</button> -->
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_pop('302010');">결재요청(새로운결재선)</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('302010');">결재요청</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>

View File

@ -112,7 +112,7 @@
success : function(returnData, status) {
if (returnData.result == 'success') {
if(isEmpty(p_param)){
alert("기일조서 등록 되었습니다.");
alert("기일조서 등록 되었습니다.");
fncGoList(); //상세
}else{
fnc_aprvl_step_1(p_param);
@ -124,7 +124,7 @@
},
error : function(e) {
alert("기일조서에 실패하였습니다.");
alert("기일조서 등록에 실패하였습니다.");
console.log("ERROR : ", e);
}
});

View File

@ -245,6 +245,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){
//updtDntSbmt(); //SBMT_YN='Y'로 처리
fncGoList(); //조정진행목록으로
}
function sendDlvInfoPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop'));
}
@ -321,6 +359,17 @@
</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 }" />" />
@ -658,7 +707,8 @@
|| info.statCd eq '303050'
|| info.statCd eq '304090'
}">
<button type="button" class="btnType02" onclick="fnc_aprvl_step_1('304010');">조정조서 승인 요청</button>
<!-- <button type="button" class="btnType02" onclick="fnc_aprvl_step_1('304010');">조정조서 승인 요청</button> -->
<button type="button" class="btnType02" onclick="fnc_aprvl_pop('304010');">조정조서 승인 요청</button>
<button type="button" class="btnType06" onclick="fncDel()">삭제</button>
<button type="button" class="btnType06" onclick="fncUpd()">수정</button>
</c:if>

View File

@ -773,6 +773,7 @@
});
}
function getPageUrl(idx) {
console.log('idx : ', idx);
switch (idx) {

View File

@ -36,6 +36,45 @@
<link rel="stylesheet" href="/kccadrPb/adm/css/popup.css">
<script src="/kccadrPb/usr/script/popup.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$("#tabNav > button").on("click", function(e) {
var idx = $(this).index();
tabPageLoad(idx);
});
tabPageLoad(0);
});
function tabPageLoad(idx) {
var url = getPageUrl(idx);
$('#tabContent').load(url, {
"adrSeq" : $("#adrSeq").val(),
"adrSn" : $("#adrSn").val(),
"reqOlCd" : $("#reqOlCd").val()
}, function(res, status, xhr) {
console.log(status);
$('.tab_cont .tbType02').find('button').remove('button');
$('.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
});
}
function getPageUrl(idx) {
console.log('idx : ', idx);
switch (idx) {
case 0:
return '/kccadr/adjPgrMgr/apm/apmTab0.do';
case 1:
return '/kccadr/adjPgrMgr/apm/apmTab1.do';
case 2:
return '/kccadr/adjPgrMgr/apm/apmTab2.do';
}
}
function fncGoList(){
var listForm = document.listForm ;
listForm.action = "<c:url value='/kccadr/adjPgrMgr/iam/internalApprovManageList.do'/>";
@ -1200,6 +1239,21 @@
</div>
</div>
<!-- 조정진행 상세 import -->
<div class="cont_tit">
<h2>조정진행상세</h2>
</div>
<!-- //cont_tit -->
<div class="cont">
<div id="tabNav" class="tab_btn tab03">
<button type="button" class="tab on" style="width: calc((100% + 3px) / 2);">사건일반</button>
<button type="button" class="tab " style="width: calc((100% + 3px) / 2);">사건문서</button>
<!-- <button class="tab ">진행정보</button> -->
</div>
<div id="tabContent" class="tab_cont on"></div>
</div>
</div>
</div>
</form:form>