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 595adb55..427fe8c8 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 @@ -47,6 +47,10 @@ public class PgrCmmServiceImpl implements PgrCmmService { @Resource(name = "adrHstryMgrDAO") private AdrHstryMgrDAO adrHstryMgrDAO; + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; + @Override public List selectPgrCmmList(PgrCmmVO pgrCmmVO) throws Exception { @@ -448,13 +452,15 @@ public class PgrCmmServiceImpl implements PgrCmmService { adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값 adjReqMgrVO.setLastUpdusrId(userId); // 최종 변경자 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + //step1.statCd 30000X 로 update - int resultCnt = kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, ""); + int resultCnt = kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq); //step2.statCd 400000 로 update statCd = KccadrConstants.ADR_CLOSE; adjReqMgrVO.setStatCd(statCd); // 최종 변경 상태값 - resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, ""); + resultCnt += kccadrMgrUdtService.updateAdrMgrUdt(adjReqMgrVO, s_adrHstryMgrSeq); //step3.접수결재 요청(ADR_RCPT_APPR_REQ, 201010), 배당결재요청(ADR_RCPT_DTB_REQ, 202010) 일 경우 결재 요청 delete 처리 if(closeVO.getStatCd().equals(KccadrConstants.ADR_RCPT_APPR_REQ) diff --git a/src/main/webapp/js/kccadr/kccadrCom.js b/src/main/webapp/js/kccadr/kccadrCom.js index 36b25f0f..a98890fb 100644 --- a/src/main/webapp/js/kccadr/kccadrCom.js +++ b/src/main/webapp/js/kccadr/kccadrCom.js @@ -336,9 +336,9 @@ function commonPopWindowopenForm(surl, popupwidth, popupheight, name, frm) { //휴대폰 번호에 대쉬(-) 추가해주기 function addDash(str) { - alert(str + "::" + str.length); +// alert(str + "::" + str.length); if(str.length == 10){ - alert("in :: " + str.replace(/^(0(2|3[1-3]|4[1-4]|5[1-5]|6[1-4]))-(\d{3,4})-(\d{4})$/, "$1-$2-$3")); +// alert("in :: " + str.replace(/^(0(2|3[1-3]|4[1-4]|5[1-5]|6[1-4]))-(\d{3,4})-(\d{4})$/, "$1-$2-$3")); return str.replace(/^(0(2|3[1-3]|4[1-4]|5[1-5]|6[1-4]))-(\d{3,4})-(\d{4})$/).replace("--", "-"); } return str.replace(/(^01[016789]{1}|070)([0-9]{3}|[0-9]{4})([0-9]{4})$/, "$1-$2-$3").replace("--", "-");