이준호 전자조정시스템고도화 커밋
2023-05-12 전자조정시스템 고도화 수정 1. 접수결재 요청 시 위원장까지 결재가 올라감 => 센터장까지만 결재 올라가도록 수정 => 2023조정035, 2023조정034 조정사건 센터장까지 결재로 DB 수정 2. 내부결재목록 > 종결결재요청 2-1. 사건문서확인 버튼이 눌리지않음 => 버튼이 눌리지 않는 오류 수정완료 2-2. 해당페이지에서 조정조서를 볼수있게 수정 => 해당페이지 조정진행 상세 하단에 조정조서가 있을경우 노출로 수정완료 2-3. 조정결과 항목에서 조정결과가 '성립'일 때 - 조정조서 성립 일 경우 => '성립(기일 합의)'으로 노출 - 조정권고 성립 일 경우 => '성립(권고 수락)'으로 노출 - 직권조정 성립 일 경우 => '성립(직권 결정)'으로 노출 => 경우에 따라 조정결과 노출되도록 수정완료
This commit is contained in:
parent
4c812efb77
commit
e2e8c1744e
@ -1326,4 +1326,59 @@ public class DrtCtrController {
|
||||
model.addAttribute("result", result);
|
||||
return "/kccadr/adjPgrMgr/drtCtr/cmmtPop";
|
||||
}
|
||||
|
||||
/**
|
||||
* 조정조서 등록 Form TODO daenge 조정조서 등록
|
||||
*
|
||||
* @param drtVO
|
||||
* @param model
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "drtCtrReg_for_ApprovManageEndDetail.do")
|
||||
public String drtCtrReg_for_ApprovManageEndDetail(PgrCmmVO cmmVO, DrtCtrVO drtCtrVO, ModelMap model) throws Exception {
|
||||
|
||||
DrtCtrVO drtCtrVO4Chk = drtCtrService.selectDrtCtrReportLast(drtCtrVO);
|
||||
|
||||
List<AssCtrVO> assListChk = drtCtrService.selectAssList(drtCtrVO); //수정용
|
||||
List<AssCtrVO> assList = null;
|
||||
|
||||
//기일변경 일자 정보 불러오기
|
||||
List<PgrCmmVO> apmChgInfo = apmService.selectApmChgDateInfo(cmmVO);
|
||||
model.addAttribute("apmChgInfo", apmChgInfo.get(0));
|
||||
|
||||
//사건정보 불러오기
|
||||
PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
|
||||
drtCtrVO.setPrtclSeq(info.getPrtclSeq());
|
||||
|
||||
|
||||
assList = drtCtrService.selectAssList(drtCtrVO4Chk);
|
||||
|
||||
//조정조서 정보 불러오기
|
||||
DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO4Chk);
|
||||
model.addAttribute("drtCtrVO", resultDrtCtrVO);
|
||||
|
||||
String pageUrl = "/kccadr/adjPgrMgr/drtCtr/drtCtrDetail"; //수정화면으로 이동한다.
|
||||
|
||||
//송달정보 count 조회해오기
|
||||
DlvinfoVO dlvInfoVO = new DlvinfoVO();
|
||||
dlvInfoVO.setSrcCon("10");
|
||||
dlvInfoVO.setSrcTxt(cmmVO.getAdrNo());
|
||||
dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq());
|
||||
dlvInfoVO.setAdrSn(cmmVO.getAdrSn());
|
||||
dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_40);
|
||||
int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO);
|
||||
model.addAttribute("dlvCnt", dlvCnt);
|
||||
|
||||
if(dlvCnt > 0) {
|
||||
model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO));
|
||||
}
|
||||
|
||||
model.addAttribute("egovCryptoUtil",egovCryptoUtil);
|
||||
|
||||
model.addAttribute("assList", assList);
|
||||
model.addAttribute("info", info);
|
||||
|
||||
return pageUrl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -161,17 +161,20 @@ public class InternalAppovManageServiceImpl implements InternalApprovManageServi
|
||||
switch (resultVO.get(0).getStatCd()) {
|
||||
case KccadrConstants.ADR_JJOSU_APPR_COMP :
|
||||
//조정조서 성립
|
||||
endResult = "조정조서 성립";
|
||||
// endResult = "조정조서 성립";
|
||||
endResult = "성립(기일 합의)";
|
||||
for(InternalApprovManageVO tmpVO2 : resultVO) {
|
||||
//조정권고 성립
|
||||
if(tmpVO2.getStatCd().equals(KccadrConstants.ADR_KKA_APPR_COMP)){
|
||||
endResult = "조정권고 성립";
|
||||
// endResult = "조정권고 성립";
|
||||
endResult = "성립(권고 수락)";
|
||||
}
|
||||
}
|
||||
break;
|
||||
case KccadrConstants.ADR_JKKJS_APPR_COMP :
|
||||
//직권조정 성립
|
||||
endResult = "직권조정 성립";
|
||||
// endResult = "직권조정 성립";
|
||||
endResult = "성립(직권 결정)";
|
||||
break;
|
||||
case KccadrConstants.ADR_BSRTBS_APPR_COMP :
|
||||
//불성립
|
||||
|
||||
@ -40,6 +40,8 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
|
||||
import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
|
||||
import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
|
||||
import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
|
||||
import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService;
|
||||
import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO;
|
||||
import kcc.kccadr.adjPgrMgr.ent.service.EntService;
|
||||
import kcc.kccadr.adjPgrMgr.ent.service.EntVO;
|
||||
import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService;
|
||||
@ -111,6 +113,9 @@ public class InternalApprovManageController {
|
||||
@Resource(name="adjRpplService")
|
||||
private AdjRpplService adjRpplService;
|
||||
|
||||
@Resource(name = "drtCtrService")
|
||||
private DrtCtrService drtCtrService;
|
||||
|
||||
// 실서버 개발서버 구분
|
||||
private static String islocal; // /pdf/out/
|
||||
@Value("#{globalSettings['Globals.prod.islocal']}")
|
||||
@ -366,6 +371,15 @@ public class InternalApprovManageController {
|
||||
model.addAttribute("aftThree", aftThree); //접수일로 3개월 뒤 날짜 정보
|
||||
//22.02.08 최고관리자의 경우 반려 결재 버튼 미노출 처리
|
||||
model.addAttribute("auth", loginVO.getAuthority());
|
||||
|
||||
DrtCtrVO drtCtrVO = new DrtCtrVO();
|
||||
drtCtrVO.setAdrSeq(internalApprovManageVO.getAdrSeq());
|
||||
drtCtrVO.setAdrSn(internalApprovManageVO.getAdrSn());
|
||||
|
||||
//조정조서 뿌리기
|
||||
DrtCtrVO drtCtrVO4Chk = drtCtrService.selectDrtCtrReportLast(drtCtrVO);
|
||||
String drtCtrYn = drtCtrVO4Chk != null ? "Y":"N";
|
||||
model.addAttribute("drtCtrYn", drtCtrYn);
|
||||
return "kccadr/adjPgrMgr/iam/internalApprovManageEndDetail";
|
||||
}
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver
|
||||
#\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84
|
||||
#Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8
|
||||
#\uac1c\ubc1c\uc11c\ubc84
|
||||
Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8
|
||||
Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
|
||||
#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8
|
||||
#\uc2e4\uc11c\ubc84
|
||||
#Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8
|
||||
@ -97,8 +97,8 @@ Globals.ckeditorUploadDir=/usr/local/tomcat/file/ckeditor/
|
||||
#TEST SERVER
|
||||
Globals.RealCntFileFolder=C:/eGovFrameDev-3.9.0-64bit_ncms/workspace/ncms39/src/main/webapp/WEB-INF/jsp/cnt/
|
||||
#\uc6b4\uc601 solr \uc8fc\uc18c
|
||||
Globals.Solr.url=http://222.231.43.89:8983/solr
|
||||
#Globals.Solr.url=http://192.168.0.125:8983/solr
|
||||
#Globals.Solr.url=http://222.231.43.89:8983/solr
|
||||
Globals.Solr.url=http://192.168.0.125:8983/solr
|
||||
#Globals.Solr.url=http://localhost:8983/solr
|
||||
|
||||
#SNS \ub85c\uadf8\uc778 KEY \uac12
|
||||
|
||||
@ -123,6 +123,8 @@
|
||||
<pattern>/web/kccadr/accdnt/ai/docIssReqRegistPop.do</pattern>
|
||||
|
||||
<pattern>/web/kccadr/payment/inipay/*</pattern> <!-- 결재 모듈 테스트 -->
|
||||
<pattern>/kccadr/adjPgrMgr/drtCtr/drtCtrReg_for_ApprovManageEndDetail.do</pattern>
|
||||
|
||||
</decorator>
|
||||
|
||||
<!-- 관리자 게시글 작성, 템플릿 미리보기(헤더풋터 없음) -->
|
||||
|
||||
@ -43,6 +43,9 @@ $(document).ready(function() {
|
||||
tabPageLoad(idx);
|
||||
});
|
||||
tabPageLoad(0);
|
||||
if('<c:out value="${drtCtrYn}"/>' == 'Y'){
|
||||
tabPageLoad_drtCtr();
|
||||
}
|
||||
});
|
||||
|
||||
function tabPageLoad(idx) {
|
||||
@ -63,6 +66,31 @@ function tabPageLoad(idx) {
|
||||
});
|
||||
}
|
||||
|
||||
function tabPageLoad_drtCtr() {
|
||||
var url = '/kccadr/adjPgrMgr/drtCtr/drtCtrReg_for_ApprovManageEndDetail.do';
|
||||
|
||||
$('#tabContent_drtCtr').load(url, {
|
||||
"adrSeq" : $("#adrSeq").val(),
|
||||
"adrSn" : $("#adrSn").val(),
|
||||
"reqOlCd" : $("#reqOlCd").val()
|
||||
}, function(res, status, xhr) {
|
||||
$('#tabContent_drtCtr').find('button').remove('button');
|
||||
$('#tabContent_drtCtr').find('a').remove('a');
|
||||
$('#tabContent_drtCtr .cont_tit').find('ul').remove('ul');
|
||||
$('#tabContent_drtCtr').find('script').remove('script');
|
||||
|
||||
var cont_tit = $('#tabContent_drtCtr .box .cont_tit').clone();
|
||||
var cont = $('#tabContent_drtCtr .box .cont').clone();
|
||||
|
||||
$('#tabContent_drtCtr .box').remove();
|
||||
|
||||
cont_tit.appendTo($('#tabContent_drtCtr'));
|
||||
cont.appendTo($('#tabContent_drtCtr'));
|
||||
$('#tabContent_drtCtr').find('form').remove('form');
|
||||
$('#tabContent_drtCtr').find('h2').text('조정조서');
|
||||
});
|
||||
}
|
||||
|
||||
function getPageUrl(idx) {
|
||||
console.log('idx : ', idx);
|
||||
switch (idx) {
|
||||
@ -138,14 +166,14 @@ function getPageUrl(idx) {
|
||||
|
||||
//사건정보 팝업
|
||||
function fncDetail() {
|
||||
var detailForm = document.detailForm;
|
||||
detailForm.tabSeq.value = "1";
|
||||
commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrDetailPop.do", "840", "800", "adrDetailPop", $('#detailForm'));
|
||||
var datailForm1 = document.datailForm1;
|
||||
datailForm1.tabSeq.value = "1";
|
||||
commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrDetailPop.do", "840", "800", "adrDetailPop", $('#datailForm1'));
|
||||
}
|
||||
|
||||
function fncFrontPrint() {
|
||||
|
||||
var form = document.detailForm;
|
||||
var form = document.datailForm1;
|
||||
window.open('',"intAppReport");
|
||||
|
||||
form.action="/kccadr/adjPgrMgr/iam/internalApprovFrontPrintAjax.do";
|
||||
@ -157,7 +185,7 @@ function getPageUrl(idx) {
|
||||
|
||||
function fncReqPrint() {
|
||||
|
||||
var form = document.detailForm;
|
||||
var form = document.datailForm1;
|
||||
window.open('',"intReqReport");
|
||||
|
||||
form.action="/kccadr/adjPgrMgr/iam/internalApprovReqReportAjax.do";
|
||||
@ -168,21 +196,21 @@ function getPageUrl(idx) {
|
||||
}
|
||||
|
||||
function fncGo(url, closeDocTy) {
|
||||
var detailForm = document.detailForm;
|
||||
detailForm.action = "<c:url value='/kccadr/adjPgrMgr/'/>" + url;
|
||||
var datailForm1 = document.datailForm1;
|
||||
datailForm1.action = "<c:url value='/kccadr/adjPgrMgr/'/>" + url;
|
||||
|
||||
if (!isEmpty(closeDocTy)) {
|
||||
$('#closeDocTy').val(closeDocTy);
|
||||
}
|
||||
|
||||
detailForm.submit();
|
||||
datailForm1.submit();
|
||||
}
|
||||
|
||||
function fncAdrDetail(){
|
||||
var detailForm = document.detailForm;
|
||||
detailForm.tabSeq.value = "1";
|
||||
detailForm.action = "<c:url value='/kccadr/adjPgrMgr/apm/apmDetail.do'/>";
|
||||
detailForm.submit();
|
||||
var datailForm1 = document.datailForm1;
|
||||
datailForm1.tabSeq.value = "1";
|
||||
datailForm1.action = "<c:url value='/kccadr/adjPgrMgr/apm/apmDetail.do'/>";
|
||||
datailForm1.submit();
|
||||
}
|
||||
|
||||
</script>
|
||||
@ -191,7 +219,7 @@ function getPageUrl(idx) {
|
||||
//아래 함수들 부터 결재문서 보기 처리
|
||||
function fncPdfFileView() {
|
||||
|
||||
var data = new FormData(document.getElementById("detailForm"));
|
||||
var data = new FormData(document.getElementById("datailForm1"));
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/kccadr/adjPgrMgr/iam/internalApprovFrontReportAjax.do",
|
||||
@ -769,11 +797,11 @@ function getPageUrl(idx) {
|
||||
|
||||
function fnc_sbstt_aprvl_pop(param){
|
||||
//commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop'));
|
||||
var detailForm = document.detailForm;
|
||||
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.do", '1000', '700', "sbsttInfoPop", $('#detailForm'));
|
||||
var datailForm1 = document.datailForm1;
|
||||
commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcSbsttAprvlReqPop.do", '1000', '700', "sbsttInfoPop", $('#datailForm1'));
|
||||
|
||||
//var detailForm = document.detailForm;
|
||||
//commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrDetailPop.do", "840", "800", "adrDetailPop", $('#detailForm'));
|
||||
//var datailForm1 = document.datailForm1;
|
||||
//commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrDetailPop.do", "840", "800", "adrDetailPop", $('#datailForm1'));
|
||||
|
||||
}
|
||||
</script>
|
||||
@ -845,15 +873,7 @@ function getPageUrl(idx) {
|
||||
<form id="popCreateForm" name="popCreateForm" method="post"></form>
|
||||
|
||||
|
||||
<form:form id="detailForm" name="detailForm" commandName="internalApprovManageVO" method="post">
|
||||
<input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${info.adrSeq}'/>"/>
|
||||
<input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
|
||||
<input type="hidden" name="sbmtSeq" id="sbmtSeq" value="<c:out value='${info.sbmtSeq}'/>"/>
|
||||
<input type="hidden" name="sbmtTy" id="sbmtTy" value="<c:out value='${info.sbmtTy}'/>"/>
|
||||
<input type="hidden" name="tabSeq" id="tabSeq" value="" />
|
||||
|
||||
<!-- 오프라인/온라인 구분 -->
|
||||
<input type="hidden" name="reqOlCd" id="reqOlCd" value="<c:out value='${info.reqOlCd}'/>"/>
|
||||
|
||||
<div class="cont_wrap">
|
||||
<div class="box">
|
||||
@ -869,6 +889,17 @@ function getPageUrl(idx) {
|
||||
</div>
|
||||
<!-- //cont_tit -->
|
||||
|
||||
<form:form id="datailForm1" name="datailForm1" commandName="internalApprovManageVO" method="post">
|
||||
<input type="hidden" name="adrSeq" id="adrSeq" value="<c:out value='${info.adrSeq}'/>"/>
|
||||
<input type="hidden" name="adrSn" id="adrSn" value="<c:out value='${info.adrSn}'/>"/>
|
||||
<input type="hidden" name="sbmtSeq" id="sbmtSeq" value="<c:out value='${info.sbmtSeq}'/>"/>
|
||||
<input type="hidden" name="sbmtTy" id="sbmtTy" value="<c:out value='${info.sbmtTy}'/>"/>
|
||||
<input type="hidden" name="tabSeq" id="tabSeq" value="" />
|
||||
<input type="hidden" name="appSeq" id="appSeq" value="1">
|
||||
|
||||
<!-- 오프라인/온라인 구분 -->
|
||||
<input type="hidden" name="reqOlCd" id="reqOlCd" value="<c:out value='${info.reqOlCd}'/>"/>
|
||||
|
||||
<div class="cont">
|
||||
|
||||
<c:import url="/web/kccadr/kccadrCom/adjstBasicInfo.do">
|
||||
@ -1251,7 +1282,7 @@ function getPageUrl(idx) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</form:form>
|
||||
<!-- 조정진행 상세 import -->
|
||||
<div class="cont_tit">
|
||||
<h2>조정진행상세</h2>
|
||||
@ -1266,8 +1297,11 @@ function getPageUrl(idx) {
|
||||
<div id="tabContent" class="tab_cont on"></div>
|
||||
</div>
|
||||
|
||||
<!-- 조정조서 -->
|
||||
<div id="tabContent_drtCtr"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</form:form>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user