diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java index cc2bc8d5..e9b8fb83 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -92,6 +92,9 @@ public interface ApmService { // 사용자 차수별 기일변경 신청건수 조회 List selectApmChgDateInfoCnt(PgrCmmVO cmmVO) throws Exception; + + // 사용자 차수별 기일변경 신청건수 조회 with 차수 + List selectApmChgDateInfoCntWithSn(PgrCmmVO cmmVO) throws Exception; int selectApmAdrNoChkCnt(ApmVO apmVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java index 695684c2..8615070d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmDAO.java @@ -181,6 +181,12 @@ public class ApmDAO extends EgovAbstractDAO { return (List) list("Apm.selectApmChgDateInfoCnt", cmmVO); } + @SuppressWarnings("unchecked") + public List selectApmChgDateInfoCntWithSn(PgrCmmVO cmmVO) throws Exception{ + + return (List) list("Apm.selectApmChgDateInfoCntWithSn", cmmVO); + } + public int selectApmAdrNoChkCnt(ApmVO apmVO) throws Exception{ return (int) select("Apm.selectApmAdrNoChkCnt",apmVO); } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java index da6a4097..1dac7a01 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/impl/ApmServiceImpl.java @@ -551,6 +551,11 @@ public class ApmServiceImpl implements ApmService { return apmDAO.selectApmChgDateInfoCnt(cmmVO); } + public List selectApmChgDateInfoCntWithSn(PgrCmmVO cmmVO) throws Exception{ + + return apmDAO.selectApmChgDateInfoCntWithSn(cmmVO); + } + @Override public String selectSbmtIngStatus(String param) throws Exception { 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 7604f655..d0002ae1 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -19,7 +19,6 @@ import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.env.SystemEnvironmentPropertySource; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -433,6 +432,10 @@ public class ApmController { // 사용자 조정기일 변경신청 건이 있는지 확인 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(); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java index 2de7d3a1..650e6b21 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmService.java @@ -14,6 +14,8 @@ public interface PgrCmmService { int selectPgrCmmListCnt(PgrCmmVO pgrCmmVO) throws Exception; PgrCmmVO selectPgrCmm(PgrCmmVO pgrCmmVO) throws Exception; + + PgrCmmVO selectPgrCmm4DntDetail(PgrCmmVO pgrCmmVO) throws Exception; void deleteCloseDoc(CloseVO closeVO , String p_code_desc diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 336bc948..4989a618 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -166,6 +166,9 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String reqOlCdPst; //과거사건목록 조회 여부 + + private String dntDetailType;//4DntDetailType(기일지정상세화면) / NoDntDetailType(이외) + public String getAdrAdmId() { return adrAdmId; } @@ -1173,6 +1176,14 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setAppSeqMin(String appSeqMin) { this.appSeqMin = appSeqMin; } + + public String getDntDetailType() { + return dntDetailType; + } + + public void setDntDetailType(String dntDetailType) { + this.dntDetailType = dntDetailType; + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java index 8c933522..def99c06 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmDAO.java @@ -36,6 +36,10 @@ public class PgrCmmDAO extends EgovAbstractDAO { return (PgrCmmVO) select("Cmm.selectPgrCmm", pgrCmmVO); } + public PgrCmmVO selectPgrCmm4DntDetail(PgrCmmVO pgrCmmVO) throws Exception { + return (PgrCmmVO) select("Cmm.selectPgrCmm4DntDetail", pgrCmmVO); + } + public void insertCloseDoc(CloseVO closeVO) { insert("Cmm.insertCloseDoc", closeVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index 5a6a0769..595adb55 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -15,13 +15,13 @@ import kcc.kccadr.adjPgrMgr.arm.service.CmntVO; import kcc.kccadr.adjPgrMgr.cmm.service.CloseVO; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; -import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; -import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO; import kcc.kccadr.adjPgrMgr.iam.service.impl.InternalApprovManageDAO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; +import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; +import kcc.let.utl.fcc.service.EgovCryptoUtil; @Repository("pgrCmmService") public class PgrCmmServiceImpl implements PgrCmmService { @@ -126,6 +126,51 @@ public class PgrCmmServiceImpl implements PgrCmmService { return result; } + @Override + public PgrCmmVO selectPgrCmm4DntDetail(PgrCmmVO pgrCmmVO) throws Exception { + + setDayInfo(pgrCmmVO); + + PgrCmmVO result = pgrCmmDAO.selectPgrCmm4DntDetail(pgrCmmVO); + + decpyptVo(result); + + if (!StringUtil.isEmpty(result.getAppPlace())) { + String app[] = (result.getAppPlace()).split("\\|"); + if (app.length > 0) { + result.setAppPlaceTx(app[0]); + if (app.length == 2) { + result.setAppPlaceDetailTx(app[1]); + } + } + + } + + if (!StringUtil.isEmpty(result.getAppPlaceAddr())) { + String app[] = (result.getAppPlaceAddr()).split("\\|"); + if (app.length > 0) { + result.setAppPlaceAddrTx(app[0]); + if (app.length == 2) { + result.setAppPlaceAddrDetailTx(app[1]); + } + } + + } + + if (!StringUtil.isEmpty(result.getApmAppPlace())) { + String app[] = (result.getApmAppPlace()).split("\\|"); + if (app.length > 0) { + result.setApmAppPlaceTx(app[0]); + if (app.length == 2) { + result.setApmAppPlaceDetailTx(app[1]); + } + } + + } + + return result; + } + /** * 신청인, 피신청인 복호화 * diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java index d4fde3af..f32b9dfb 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -137,7 +137,9 @@ public class DntController { } - PgrCmmVO dntVO = getDntInfo(cmmVO); + cmmVO.setDntDetailType("4DntDetailType"); + + PgrCmmVO dntVO = getDntInfo4Detail(cmmVO); model.addAttribute("info", dntVO); //송달정보 count 조회해오기 @@ -272,6 +274,7 @@ public class DntController { } + //조정진행상세에서 사용하는 app_seq 값(?) private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); if (!StringUtil.isEmpty(dntVO.getMemNames())) { @@ -293,7 +296,26 @@ public class DntController { } - + //조정진행상세 > 기일지정상세 화면에서 사용하는 app_seq 값(?) - app_seq=1 or (sbmt_yn=Y and appr_yn=Y)(승인 받은 값) + private PgrCmmVO getDntInfo4Detail(PgrCmmVO cmmVO) throws Exception { + PgrCmmVO dntVO = cmmService.selectPgrCmm4DntDetail(cmmVO); + if (!StringUtil.isEmpty(dntVO.getMemNames())) { + String[] memNames = dntVO.getMemNames().split(", "); + String[] assSeqes = dntVO.getAssSeqes().split(", "); + + if(memNames.length==1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + }else if(memNames.length>1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + dntVO.setAddUsrNm1(memNames[1]); + dntVO.setAssSeq1(assSeqes[1]); + } + + } + return dntVO; + } /** * 기일지정 등록 TODO daenge 기일지정 등록 diff --git a/src/main/java/kcc/let/uat/uia/web/SsoLogin.java b/src/main/java/kcc/let/uat/uia/web/SsoLogin.java index fc3296c0..40113eed 100644 --- a/src/main/java/kcc/let/uat/uia/web/SsoLogin.java +++ b/src/main/java/kcc/let/uat/uia/web/SsoLogin.java @@ -47,9 +47,9 @@ public class SsoLogin { String client_ip = "127.0.0.1"; // https://devoneid.copyright.or.kr 에서 가입함 ID/PW 입력 - /*String user_id = "itn0801@gmail.com";*/ + /*String user_id = "itn0801@gmail.com";*/ //itntest123$ String user_id = Id; - /*String user_pwd = "itntest123$";*/ + String user_pwd = Password; SsoLoginVO ssoLoginVO = new SsoLoginVO(); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml index 198f1380..195c3798 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/apm/Apm_SQL_Mysql.xml @@ -296,6 +296,7 @@ - + /* apmChgDateCnt-조정기일변경신청건(등록건) */ SELECT a.adr_seq AS adrSeq, a.adr_sn AS adrSn, a.app_seq AS appSeq, @@ -1171,6 +1172,27 @@ + + + + /* sbmtStatus-진행상태가 결재요청일때 진행중인사람정보 */ SELECT CASE T1.sbmt_ty WHEN '201010' diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index dde5ba60..157d8435 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -141,6 +141,7 @@ + + + + /* drtInfo-최종기일조서값 */ SELECT a.adr_seq adrSeq, a.adr_sn adrSn, a.prtcl_seq prtclSeq, diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/ent/Ent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/ent/Ent_SQL_Mysql.xml index 143b18a8..cc0d6256 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/ent/Ent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/ent/Ent_SQL_Mysql.xml @@ -6,6 +6,7 @@ + /* adr_mstry_mgr list_mgr-이력값 */ SELECT , c.code_nm AS aCodeNm /*관리자 코드값*/ diff --git a/src/main/resources/egovframework/sqlmap/kccadr/ojct/Ojct_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/ojct/Ojct_SQL_Mysql.xml index 19829947..f485d2ef 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/ojct/Ojct_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/ojct/Ojct_SQL_Mysql.xml @@ -48,6 +48,7 @@ " /> + " /> + " /> + + " /> + " /> + + " /> + " /> + <%-- " /> --%> + + + + + + + +
+ " /> + " /> + + +
+
+ " /> + +
+ + " /> +
+
+ 개발용 코드 노출 삭제 예정임/${info.statCd}/ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- 취하신청이 있을경우 취하신청 사유 팝업_이준호_220322 --%> + + + + + <%-- 관리자 취하신청 등록_이준호_220322 + 배당결제 반려(ADR_DEPT_SLCT_RETN)보다 크고 + 종결결재 요청(ADR_CLOSE_APPR_REQ)보다 작거나 같은 경우 버튼 노출 + * 배당결재 완료(202050)보다 배당결재 반려(202090)의 값이 크기 때문에 반려 보다 크다로 지정 + --%> + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + <%-- + + --%> + + + + + + + + + + + + <%-- + + + + + + + + + + --%> + + + <%-- + + + + + (기존 기일조서값이 없으면 등록, 있으면 기일조서수정) + + + (기존 기일조서값이 없으면 등록, 있으면 기일조서수정) + + + + + + + + + + + --%> + + + <%-- + + + + + (기존 기일조서값이 없으면 등록, 있으면 기일조서수정) + + + (기존 기일조서값이 없으면 등록, 있으면 기일조서수정) + + + + + + + + + + + --%> + + + <%-- + + --%> + + + + + <%-- --%> + + + <%-- + + + + + (기존 기일조서값이 없으면 등록, 있으면 기일조서수정) + + + (기존 기일조서값이 없으면 등록, 있으면 기일조서수정) + + + + + + + + + + + --%> + + + + + <%-- 조정 참관 대리인승인 상세 --%> + <%-- + + --%> + + <%-- + + --%> + + + + + + + + + + <%-- 배당전취하종결 버튼 노출 + 입금완료(ADR_PAY_COMP, 104050)보다 같거나 크고 + 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 보다 같거나 작은경우 + 또는 + 조정접수 상태일 경우(ADR_RCPT_COMP, 101050) + --%> + + + + + + + <%-- + + + + --%> +
+
+ + +
+
+ + + + + + + + + +

+ 조정 사건 일반 + +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사건 +

+ + + () + +

+ + + + 		사건내용 +

+ + +

+
신청인 +

+ + + + +

+ 		대리인 +

+ + + + + + + +

+
피신청인 +

+ <%-- --%> + + + + + + + + + + + +

+ 		대리인 +

+ + + + + + + + + + + +

+
신청일 +

+ +

+ 		처리일자 +

+ + (신청일 +3개월) +

+ + + +
조정부 +

+ + +

+ 		조정 조사관 +

+ + + + +

+
진행상태 +

+ + + ( 결재 대기 중) + +

+
+
+ + + +

신청인정보

+
+ + + + + + + + + + +
신청인정보가 없습니다.
+
+

피신청인정보

+
+ + + + + + + + + + +
피신청인정보가 없습니다.
+
+ + + + + +

신청인정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

신청인 분류

+ 		+ +
+

신청인 이름

+
+

주소

+ 		+ () + +
+

이메일

+
+

연락처

+
+

이메일 수신여부

+
+

SMS 수신여부

+
+

우편물 수령지

+ 		+ () + +
+
+ + +

대리인정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

대리인 이름

+
+

본인과의 관계

+ 		+ + + () + +
+

직책

+
+

대리인 주소

+ 		+ () + +
+

이메일

+
+

연락처

+
+

이메일 수신여부

+
+

SMS 수신여부

+
+

우편물 수령지

+ 		+ () + +
+

첨부파일

+ 		+ + + +
+
+ + +

피신청인${rpplCnt} 정보

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

피신청인 분류

+
+

피신청인 이름

+
+

주소

+ 		+ () + +
+

이메일

+
+

연락처

+
+

이메일 수신여부

+
+

SMS 수신여부

+
+

우편물 수령지

+ 		+ () + +
+
+ + + + + + + + <%-- --%> + + + +

조정기일 차

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조정부 +

+ +

+
차수 +

+ + 차 +

+
사건 +

+ +

+ 		사건내용 +

+ +

+
신청인 +

+ +

+ 		대리신청인 +

+ +

+
피신청인 +

+ +

+ 		대리신청인 +

+ +

+
조정기일 +

+ + +

+ + + + + + + + +
장소 +

+ + <%-- --%> +

+
주소 +

+ + <%-- --%> +

+
조정부장 +

+ +

+
조정위원 +

+ + + + 기피신청노출 + + + + +

+
조정조사관 +

+ +

+
기일조정 결과 +

+ + + + + + - + + + +

+
+
+ + + + + + + <%-- 종결결재 반려 시 반려사유 첨부파일 등록 --%> + <%-- --%> + <%-- 종결결재 반려 상태 또는 등록된 종결결재 반려 첨부파일이 있을 경우 노출 --%> + <%-- +

종결결재 반려 첨부파일

+
+ + + + + + + + + + + +
조정조사관 +

+ +

+
+
+ --%> + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp index dd688445..60c95d61 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp @@ -230,6 +230,72 @@ }); } + //결재선 팝업 - 고도화 + 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 updtDntSbmt(){ + + var data = new FormData(document.getElementById("listForm")); + + $.ajax({ + type: "POST", + url: "/kccadr/adjPgrMgr/dnt/dntUpdSbmtAjax.do", + 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'){ + alert('성공적으로 요청하였습니다.'); + fncGoList(); + }else{ + alert(returnData.message); + } + }, + error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + function fncPrint() { var form = document.listForm; @@ -319,6 +385,17 @@ + +
+ " /> + " /> + " /> + + + + +
+
" /> " /> @@ -460,9 +537,26 @@ 조정부장 + - - + + + +   + + + + + + + 조정위원1 @@ -474,6 +568,17 @@ --> + + + + + + + @@ -486,6 +591,15 @@ --> + + + + + @@ -585,7 +699,9 @@
-
+
+ +
<%-- @@ -597,18 +713,25 @@ --%> - - - + + + + + - + + - +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp index 3563181f..3ac6c1fe 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp @@ -447,9 +447,18 @@ 조정부장 + + +<%-- --%> +   + + + + 조정위원1 @@ -482,10 +491,15 @@
- - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 3114ee34..71b7c43a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -528,7 +528,18 @@ 조정부장 + +   + + + + + @@ -537,8 +548,13 @@   + public static final String ADR_DEPT_SLCT_COMP = "202050"; // 조정부지정완료 + 조정부비정완료인 경우만 대석 버튼 노출해서 수정 가능하게 + --> + + + + @@ -548,8 +564,12 @@   + public static final String ADR_DEPT_SLCT_COMP = "202050"; // 조정부지정완료 + 조정부비정완료인 경우만 대석 버튼 노출해서 수정 가능하게 + --> + + + @@ -661,16 +681,23 @@ ADR_APP_NTC_RETN : "205090", // 기일통지서반려(211104 추가) ADR_APP_ADD : "204040", // 기일추가 ADR_APP_CHG_APPR : "204050", // 기일변경승인 + + //기일 지정에 대한 상세 또는 기일 변경이 승인된 경우만 나옴 + --> + || info.statCd== KccadrConstants.ADR_APP_NTC_RETN}"> + +<%-- --%> + - - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntReg.jsp index 00a65b31..a7bf9276 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntReg.jsp @@ -339,9 +339,18 @@ 조정부장 + + +<%-- --%> +   + + + + 조정위원1 @@ -376,7 +385,8 @@
- + 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 235ec26b..75fb33ab 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 @@ -440,10 +440,6 @@ } } - - - - diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcSttst/memSttstList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcSttst/memSttstList.jsp index 39dd7fcd..15eb61aa 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcSttst/memSttstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcSttst/memSttstList.jsp @@ -96,7 +96,7 @@
-

조정위원별 사건 관리 현황 통계(작업중)

+

조정위원별 사건 관리 현황 통계

  • diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp index 55df40cf..4bfba50d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp @@ -100,10 +100,16 @@ function getPageUrl(idx){ } alert("반려되었습니다."); }else{ + /* if(statCd == '204010' || statCd == '205010'){ updtDntApprYn('Y', s_adrHstryMgrSeq); } - + */ + + if(statCd == '205010'){ //기일변경승인처리는 appr_yn 값을 변경하지 않는다. + updtDntApprYn('Y', s_adrHstryMgrSeq); + } + var exportUrl = ""; if(statCd == '205010'){ // 기일통지서 승인 처리시 오즈리포트 Export 요청