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

이준호 전자조정시스템 고도화 커밋

Browse Source 
- 기일통지서, 기일조서 결재요청 후 조정부장 결재 자동 처리
 - 송달 수정
This commit is contained in:
leejunho 2023-02-06 17:30:19 +09:00
parent 40afa91f5e
commit f49e5ebfb0
12 changed files with 192 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -613,7 +613,7 @@
<build>
<defaultGoal>install</defaultGoal>
<directory>${basedir}/target</directory>
<finalName>kcc_adr_advc</finalName>
<finalName>ROOT</finalName>
<pluginManagement>
<plugins>
<plugin>

2
src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java
View File

@ -30,7 +30,7 @@ public interface AprvlMgrService {
) throws Exception;
//조정사건결재저장 - 2022-10고도화
int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO
String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO
, String p_code_desc
, String p_stat_cd
, String p_adrHstryMgrSeq

7
src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java
View File

@ -99,7 +99,7 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr
}
//조종사건결재
public int insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO
public String insertAdrSbmtMgr202210(AprvlMgrVO aprvlMgrVO
, String p_code_desc
, String p_stat_cd
, String p_adrHstryMgrSeq
@ -110,7 +110,7 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr
AprvlMgrVO aprvlMgrVOtmp = aprvlMgrDAO.select4InsertAdrSbmtMgr(aprvlMgrVO);
System.out.println("======================================202210==고도화 결재선 교체==");
aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq()); //!!!!!!!!!!!
aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq());
if (aprvlMgrVOtmp.getSbmtId1()!=null && !"".equals(aprvlMgrVOtmp.getSbmtId1())) {
@ -264,7 +264,8 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr
);
//adr_hstry_mgr에 값 넣기 - 끝
return rs;
/*return rs;*/
return aprvlMgrVO.getSbmtSeq();
}
//조종사건수정

18
src/main/java/kcc/kccadr/aprvl/web/AprvlMgr202210Controller.java
View File

@ -376,12 +376,19 @@ public class AprvlMgr202210Controller {
//조정사건결재 내용 추가해주기
//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09
i = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO
, "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199
, "A070" //String p_stat_cd
, s_adrHstryMgrSeq
, adrSbmtLineMgrUsrVO
// i = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO
// , "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199
// , "A070" //String p_stat_cd
// , s_adrHstryMgrSeq
// , adrSbmtLineMgrUsrVO
// );
String sbmtSeq = aprvlMgrService.insertAdrSbmtMgr202210(aprvlMgrVO
, "조정진행관리>>조정진행목록>조정진행상세>결재요청" //String p_code_desc - CC199
, "A070" //String p_stat_cd
, s_adrHstryMgrSeq
, adrSbmtLineMgrUsrVO
);
if(!"".equals(sbmtSeq)) i = 1;
//조정부가 있는지 확인 하자.
aprvlMgrVO = aprvlMgrService.selectDetail(aprvlMgrVO);
@ -434,6 +441,7 @@ public class AprvlMgr202210Controller {
modelAndView.addObject("status", "success");
modelAndView.addObject("sbmtSeq", sbmtSeq);
}catch(Exception ex) {
modelAndView.addObject("status", "fail");
modelAndView.addObject("message", "결재선 생성 실패.-step0");

1
src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml
View File

@ -198,6 +198,7 @@
, REG_NM = #regNm#
, LAST_UPDUSR_ID = #lastUpdusrId#
, LAST_UPDT_PNTTM = SYS_DATETIME
, DLVRY_DOC_TY = #dlvryDocTy#
WHERE ADR_SEQ = #adrSeq#
AND ADR_SN = #adrSn#
AND DLVRY_SEQ = #dlvrySeq#

6
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoDetail.jsp
View File

@ -5,6 +5,7 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<!DOCTYPE html>
<html lang="ko">
<head>
@ -203,7 +204,10 @@
<tr>
<th>송달서류</th>
<td colspan="3">
<p><c:out value="${ info.dlvryDocTyTxt }"></c:out></p>
<p>
<kc:select codeId="CC004" id="dlvryDocTy" name="dlvryDocTy" selectedValue="${info.dlvryDocTy }" />
<%-- <c:out value="${ info.dlvryDocTyTxt }"></c:out> --%>
</p>
</td>
</tr>
<tr>

28
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp
View File

@ -170,16 +170,24 @@
<c:forEach var="item" items="${list}" varStatus="status">
<tr>
<td>
<c:out value="${item.frstRegistPnttm}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.frstRegistPnttm}" />
</a>
</td>
<td>
<c:out value="${item.adrNo}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.adrNo}" />
</a>
</td>
<td>
<c:out value="${item.rpplTyTxt}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.rpplTyTxt}" />
</a>
</td>
<td>
<c:out value="${item.rpplNm}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.rpplNm}" />
</a>
</td>
<td>
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
@ -187,13 +195,19 @@
</a>
</td>
<td>
<c:out value="${item.dlvryDocTyTxt}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.dlvryDocTyTxt}" />
</a>
</td>
<td>
<c:out value="${item.sendDeDay}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.sendDeDay}" />
</a>
</td>
<td>
<c:out value="${item.recDeDay}" />
<a href="#none" onclick="fncGoDetail('${item.adrSeq}','${item.adrSn}','${item.dlvrySeq}');">
<c:out value="${item.recDeDay}" />
</a>
</td>
</tr>

16
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvAdrNoListPop.jsp
View File

@ -43,7 +43,12 @@
listForm.action = "<c:url value='/kccadr/adjPgrMgr/dlvinfo/popup/dlvSearchAdrNoPop.do'/>";
listForm.submit();
}
function fncSearchAdrNo(){
var listForm = document.listForm;
listForm.action = "<c:url value='/kccadr/adjPgrMgr/dlvinfo/popup/dlvSearchAdrNoPop.do'/>";
listForm.submit();
}
</script>
</head>
<body>
@ -53,17 +58,18 @@
<input type="hidden" name="pageIndex" value="<c:out value='${cmmVO.pageIndex}' default='1' />"/>
<input type="hidden" name="searchSortCnd" value="<c:out value="${cmmVO.searchSortCnd}" />" />
<input type="hidden" name="searchSortOrd" value="<c:out value="${cmmVO.searchSortOrd}" />" />
<input type="hidden" name="searchCondition" value="10" />
<div class="cont_popup">
<p class="tit_text">송달정보 사건번호 목록</p>
<!-- <ul class="search_form">
<ul class="search_form">
<li>
<p class="search_tit">검색 : </p>
<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="">
<button class="btn_search" onclick="fncSearchUser(); return false;">검색</button>
<input type="text" id=searchKeyword name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="${cmmVO.searchKeyword}">
<button class="btn_search" onclick="fncSearchAdrNo(); return false;">검색</button>
</li>
</ul> -->
</ul>
<table class="pop_tbType02">
<colgroup>

101
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp
View File

@ -257,7 +257,9 @@
}
//결재 팝업이후 처리 내용
function fnc_aprvl_pop_ret(param){
function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){
$('#sbmtSeq').val(sbmtSeq);
$('#sbmtTy').val(sbmtTy);
updtDntSbmt(); //SBMT_YN='Y'로 처리
//fncGoList(); //조정진행목록으로
}
@ -379,12 +381,11 @@
/* 기일통지서 승인요청 후 자동으로 조정부장 결재되도록 처리 */
function fncApprPass(){
var data = {
adrSeq : $("#adrSeq").val(),
adrSn : $("#adrSn").val(),
sbmtSeq : $("#sbmtSeq").val(), /* 값받아와야함!! */
sbmtTy : $("#sbmtTy").val(), /* 값받아와야함!! */
sbmtSeq : $("#sbmtSeq").val(),
sbmtTy : $("#sbmtTy").val(),
sbmtYn : 'Y'
}
@ -408,56 +409,11 @@
}else if(returnData.result == 'SUCCESS'){
var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq;
if(statCd == '205010'){ //기일변경승인처리는 appr_yn 값을 변경하지 않는다.
updtDntApprYn('Y', s_adrHstryMgrSeq);
}
updtDntApprYn('Y', s_adrHstryMgrSeq);
var exportUrl = "";
if(statCd == '205010'){ // 기일통지서 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do";
}else if(statCd == '302010'){ // 기일조서 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/drt/drtOzExportAjax.do";
}else if(statCd == '303010'){ // 조정권고안 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/arm/armOzExportAjax.do";
//조정권고안 종결문서 번호 입력
$('#closeDocTy').val("30");
}else if(statCd == '304010'){ // 조정조서 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/drtCtr/drtCtrOzExportAjax.do";
//조정조서 종결문서 번호 입력
$('#closeDocTy').val("40");
}else if(statCd == '305010'){ // 취하종결 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/ent/entOzExportAjax.do";
//취하종결 문서 번호 입력
$('#closeDocTy').val("50");
}else if(statCd == '306010'){ // 직권조정결정서 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/oad/oadOzExportAjax.do";
//조정종결문서 번호 입력
$('#closeDocTy').val("60");
}else if(statCd == '307010'){ // 불성립종결 통보서 승인 처리시 오즈리포트 Export 요청
exportUrl = "/kccadr/adjPgrMgr/crt/crtOzExportAjax.do";
//불성립종결 통보서 종결문서 번호 입력
$('#closeDocTy').val("70");
}
if(exportUrl != ''){
//오즈리포트 Export 처리 요청
ozExportReport(exportUrl);
}
alert("승인되었습니다.");
exportUrl = "/kccadr/adjPgrMgr/dnt/dntOzExportAjax.do";
ozExportReport(exportUrl);
alert("승인되었습니다.");
}
location.reload();
},
@ -470,7 +426,7 @@
function updtDntApprYn(status
, s_adrHstryMgrSeq
){
alert("function_updtDntApprYn in");
var data = new FormData(document.getElementById("detailForm"));
data.append("apprYn" ,status);
data.append("assHstrySeq" ,s_adrHstryMgrSeq);
@ -497,6 +453,33 @@
error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
function ozExportReport(exportUrl){
var data = new FormData(document.getElementById("detailForm"));
$.ajax({
type: "POST",
url: exportUrl,
data: data,
dataType:'json',
async: false,
processData: false,
contentType: false,
cache: false,
success: function (returnData, status) {
console.log(returnData.result);
//alert(returnData.result);
if(returnData.result == 'SUCCESS'){
}else{
alert(returnData.message);
}
},
error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
</script>
</head>
<body>
@ -511,6 +494,16 @@
</form>
<form:form id="detailForm" name="detailForm" commandName="adjstConciliatorVO" onsubmit="return false;" 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=""/>
<input type="hidden" name="sbmtTy" id="sbmtTy" value=""/>
<input type="hidden" name="appSeq" id="appSeq" value="<c:out value='${info.appSeq}'/>"/>
<input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
<input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
</form: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="regNm" name="regNm" />

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

@ -406,9 +406,11 @@
}
//결재 팝업이후 처리 내용
function fnc_aprvl_pop_ret(param){
//updtDntSbmt(); //SBMT_YN='Y'로 처리
fncGoList(); //조정진행목록으로
function fnc_aprvl_pop_ret(sbmtSeq, sbmtTy){
$('#sbmtSeq').val(sbmtSeq);
$('#sbmtTy').val(sbmtTy);
// fncGoList(); //조정진행목록으로
fncApprPass();
}
function fncAppResultTyChg(){
@ -447,6 +449,76 @@
var pop = document.pop;
commonPopWindowopenForm("/kccadr/adjPgrMgr/drt/popup/addAgntPop.do", "750", "660", "addAgntPop", $('#pop'));
}
/* 기일조서 승인요청 후 자동으로 조정부장 결재되도록 처리 */
function fncApprPass(){
var data = {
adrSeq : $("#adrSeq").val(),
adrSn : $("#adrSn").val(),
sbmtSeq : $("#sbmtSeq").val(),
sbmtTy : $("#sbmtTy").val(),
sbmtYn : 'Y'
}
var statCd = $('#statCd').val();
$.ajax({
type: "POST",
url: "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do",
data: JSON.stringify(data),
dataType:'json',
async: false,
processData: false,
contentType: "application/json",
cache: false,
success: function (returnData, status) {
if(returnData.result == 'FAIL'){
if(returnData.message != ''){
alert(returnData.message);
}else{
alert("처리중 오류가 발생하였습니다.");
}
}else if(returnData.result == 'SUCCESS'){
var s_adrHstryMgrSeq = returnData.adrHstryMgrSeq;
var exportUrl = "";
exportUrl = "/kccadr/adjPgrMgr/drt/drtOzExportAjax.do";
//오즈리포트 Export 처리 요청
ozExportReport(exportUrl);
alert("승인되었습니다.");
}
location.reload();
},
error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
function ozExportReport(exportUrl){
var data = new FormData(document.getElementById("detailForm"));
$.ajax({
type: "POST",
url: exportUrl,
data: data,
dataType:'json',
async: false,
processData: false,
contentType: false,
cache: false,
success: function (returnData, status) {
console.log(returnData.result);
//alert(returnData.result);
if(returnData.result == 'SUCCESS'){
}else{
alert(returnData.message);
}
},
error: function (e) { alert("Export 요청에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
</script>
</head>
@ -462,6 +534,17 @@
<input type="hidden" id="rpplSeq" name="rpplSeq" />
</form>
<form:form id="detailForm" name="detailForm" commandName="DrtVO" onsubmit="return false;" 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=""/>
<input type="hidden" name="sbmtTy" id="sbmtTy" value=""/>
<input type="hidden" name="appSeq" id="appSeq" value="<c:out value='${info.appSeq}'/>"/>
<input type="hidden" name="statCd" id="statCd" value="<c:out value='${info.statCd}'/>"/>
<input type="hidden" name="closeDocTy" id="closeDocTy" value=""/>
</form: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 }" />" />

2
src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp
View File

@ -862,7 +862,7 @@ function fn_save_aprvl() {
if (returnData.status == "success") {
alert("결재요청 완료되었습니다.");
//top.window.opener.parent.location.reload();
top.window.opener.fnc_aprvl_pop_ret();
top.window.opener.fnc_aprvl_pop_ret(returnData.sbmtSeq, $("#sbmtTyCd").val());
fncGoClose();
}else{
alert("ERROR");

2
src/main/webapp/WEB-INF/web.xml
View File

@ -140,5 +140,5 @@
</security-constraint>
<!-- tomcat clustering setting -->
<distrubutable />
<distrubutable/>
</web-app>