diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java index afcbb2d8..4bcab201 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java @@ -158,6 +158,13 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { private String rpplConnNo; private String resPonDentNms = ""; //피신청인 총 갯수 + private String assPstSeq; + private String memPstSeq; + private String memDeptNm; + private String assPstUsrNm; + private String adrHstrySeq; + private String pstCn; + public AdjReqMgrVO getAdrVO() { return adrVO; } @@ -781,6 +788,42 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { public void setResPonDentNms(String resPonDentNms) { this.resPonDentNms = resPonDentNms; } + public String getAssPstSeq() { + return assPstSeq; + } + public void setAssPstSeq(String assPstSeq) { + this.assPstSeq = assPstSeq; + } + public String getMemPstSeq() { + return memPstSeq; + } + public void setMemPstSeq(String memPstSeq) { + this.memPstSeq = memPstSeq; + } + public String getMemDeptNm() { + return memDeptNm; + } + public void setMemDeptNm(String memDeptNm) { + this.memDeptNm = memDeptNm; + } + public String getAssPstUsrNm() { + return assPstUsrNm; + } + public void setAssPstUsrNm(String assPstUsrNm) { + this.assPstUsrNm = assPstUsrNm; + } + public String getAdrHstrySeq() { + return adrHstrySeq; + } + public void setAdrHstrySeq(String adrHstrySeq) { + this.adrHstrySeq = adrHstrySeq; + } + public String getPstCn() { + return pstCn; + } + public void setPstCn(String pstCn) { + this.pstCn = pstCn; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index d153df77..81bdf59d 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -38,6 +38,8 @@ public interface AdjReqMgrPastService { ResponseEntity deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO); - String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO); + AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO); + + void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 025afcfa..c7302728 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -44,6 +44,8 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String pstCn; /* 조정결과 */ + private String memPstSeq; /* 조정부 PK */ + // 조정사건 @@ -206,10 +208,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String refAdrSn; // 참고용 조정회차 private String refSeq1; // 참고용 일련번호 1 private String refSeq2; // 참고용 일련번호 2 + - private String adrHstryList[]; - - + private String adrHstryList[]; public AdjReqMgrVO getAdrVO() { return adrVO; @@ -371,6 +372,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.addDe = addDe; } + public String getPstCn() { + return pstCn; + } + + public void setPstCn(String pstCn) { + this.pstCn = pstCn; + } + public String getAdrSeq() { return adrSeq; } @@ -867,6 +876,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.addAgntList = addAgntList; } + public String[] getAddUsrNmList() { + return addUsrNmList; + } + + public void setAddUsrNmList(String[] addUsrNmList) { + this.addUsrNmList = addUsrNmList; + } + public String getAdrSn() { return adrSn; } @@ -1163,6 +1180,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.appResultTy = appResultTy; } + public String getAppResultTx() { + return appResultTx; + } + + public void setAppResultTx(String appResultTx) { + this.appResultTx = appResultTx; + } + public String getMemDeptNm() { return memDeptNm; } @@ -1243,22 +1268,6 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.appPlaceDetailTx = appPlaceDetailTx; } - public String[] getAddUsrNmList() { - return addUsrNmList; - } - - public void setAddUsrNmList(String[] addUsrNmList) { - this.addUsrNmList = addUsrNmList; - } - - public String getAppResultTx() { - return appResultTx; - } - - public void setAppResultTx(String appResultTx) { - this.appResultTx = appResultTx; - } - public String getAdrHstrySeq() { return adrHstrySeq; } @@ -1339,15 +1348,13 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.adrHstryList = adrHstryList; } - public String getPstCn() { - return pstCn; + public String getMemPstSeq() { + return memPstSeq; } - public void setPstCn(String pstCn) { - this.pstCn = pstCn; - } - - + public void setMemPstSeq(String memPstSeq) { + this.memPstSeq = memPstSeq; + } // ============================================= diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 6c79e1fd..1ce3f0cc 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO; @@ -107,8 +108,44 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { } - public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { - return (String) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO); + public AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO); } + + public int updateAdjReqMgrOffMaster(AdjReqMgrPastVO adjReqMgrPastVO) { + return update("adjReqMgrPastDAO.updateAdjReqMgrPastMaster", adjReqMgrPastVO ); + } + + + public int updateAdjReqMgrPastRppl(AdjReqMgrPastVO adjReqMgrPastVO) { + return update("adjReqMgrPastDAO.updateAdjReqMgrPastRppl", adjReqMgrPastVO); + } + + public void updateMemDeptNm(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateMemDeptNm", adjReqMgrPastVO); + } + + public void updateAssPstUsrNm(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAssPstUsrNm", adjReqMgrPastVO); + } + + public void updateAdrHstry(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAdrHstry", adjReqMgrPastVO); + } + + + public List selectAdrPrtclMgrRow(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectAdrPrtclMgrRow", adjReqMgrPastVO); + } + + public void updateAdrMgrDetailPstCn(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateAdrMgrDetailPstCn", adjReqMgrPastVO); + + } + + public void deleteAdrPrtclMgrRow(AdjReqMgrPastVO adjReqMgrPastVO) { + delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO ); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index a52721db..b84017a1 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -2,9 +2,7 @@ package kcc.kccadr.adjReqMgrPast.service.impl; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.Resource; @@ -15,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import com.mchange.v2.sql.filter.SynchronizedFilterCallableStatement; - import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; @@ -103,7 +99,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements String rpplTy = resultAdjReqMgrList.get(0).getRpplTy(); int listCnt = resultAdjReqMgrList.size(); - logger.info(" + listCnt :: [{}]", listCnt); //신청 대리인 여부 확인 int rpplTy_30_exist = 0; @@ -113,7 +108,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements rpplTy = resultAdjReqMgrList.get(i).getRpplTy(); AdjReqMgrPastVO temp = new AdjReqMgrPastVO(); - + if(rpplTy.equals(KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY)) { //신청 대리인 정보 추가해주기 @@ -143,7 +138,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //신청인 정보 추가해주기 temp = resultAdjReqMgrList.get(i); - logger.info(""); resultAdjReqMgrOffLine.getAdjReqMgrVoList().add(decryptAdjReqMgrReturn(temp)); } @@ -169,7 +163,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } // 피신청인 총 갯수 저장해주기 - resultAdjReqMgrOffLine.setReqPerTotCnt(Integer.toString(totCnt)); + resultAdjReqMgrOffLine.setReqPerTotCnt(Integer.toString(totCnt)); + resultAdjReqMgrOffLine.setRpplTy(resultAdjReqMgrOffLine.getAdjReqMgrVoList().get(1).getRpplTy()); + } return resultAdjReqMgrOffLine; @@ -189,7 +185,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements String rpplRealAddr = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소 String rpplRealAddrDtl = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소 - logger.info("resultAdjReqMgrOffLine.getRp11plTy() :: [{}]", adjReqMgrPastVO.getRpplTy()); adjReqMgrPastVO.setRpplNm(rpplNm); adjReqMgrPastVO.setRpplEmail(rpplEmail); adjReqMgrPastVO.setRpplPhone(rpplPhone); @@ -433,11 +428,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //rpplCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num)); } - } - - - } int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); @@ -772,8 +763,102 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override - public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { + public AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { return adjReqMgrPastDAO.findByAdrHstryWhereStatCd(adjReqMgrPastVO); } + + + // 오프라인 조정신청 이름, 이메일, 연락처, 주소정보 암호화 후 데이터베이스에 수정해주기 + public int cryptAdjReqMgrSendUpdate(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ + + String rpplNm = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplNm()); //신청인이름 + String rpplEmail = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplEmail()); //이메일주소 + String rpplPhone = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplPhone()); //연락처 + String rpplPost = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplPost()); //우편번호 + String rpplAddr = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplAddr()); //주소 + String rpplAddrDtl = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplAddrDtl()); //상세주소 + String rpplRealPost = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealPost()); //우편물 수령지 우편번호 + String rpplRealAddr = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소 + String rpplRealAddrDtl = egovCryptoUtil.encrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소 + + adjReqMgrPastVO.setRpplNm(rpplNm); + adjReqMgrPastVO.setRpplEmail(rpplEmail); + adjReqMgrPastVO.setRpplPhone(rpplPhone); + adjReqMgrPastVO.setRpplPost(rpplPost); + adjReqMgrPastVO.setRpplAddr(rpplAddr); + adjReqMgrPastVO.setRpplAddrDtl(rpplAddrDtl); + adjReqMgrPastVO.setRpplRealPost(rpplRealPost); + adjReqMgrPastVO.setRpplRealAddr(rpplRealAddr); + adjReqMgrPastVO.setRpplRealAddrDtl(rpplRealAddrDtl); + + //디비에 수정해 주기 + int resultCnt = adjReqMgrPastDAO.updateAdjReqMgrPastRppl(adjReqMgrPastVO); + + return resultCnt; + } + + + @Override + public void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException { + + logger.info(" ++ updateAdjReqMgrEtc ++ "); + // 조정부 수정 + adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO); + + // 조사관 수정 + adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); + + // 최종결과 CODE 수정 + adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO); + + // 조정결과 수정 + adjReqMgrPastDAO.updateAdrMgrDetailPstCn(adjReqMgrPastVO); + + + /* + * TODO 차수 수정 + * TB adr_prtcl_mgr + * 기존 차수와 현재 차수 갯수가 다르면 삭제 및 추가 해야함 + * */ + List prtclRowList = adjReqMgrPastDAO.selectAdrPrtclMgrRow(adjReqMgrPastVO); +// System.out.println("prtclRowList.get(0).getPrtclSeq() : "+ prtclRowList.get(0).getPrtclSeq()); + prtclRowList.forEach(t->{ + logger.info(" + t.getAdrSeq() [{}], [{}], [{}]", t.getAdrSeq(), t.getAdrSn(), t.getPrtclSeq()); + }); + logger.info(" exist row size :: [{}]", prtclRowList.size()); + logger.info(" modify row size :: [{}]", adjReqMgrPastVO.getAdrSn()); + int existAdrSnSize = prtclRowList.size(); + int changeAdrSnSize = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + + // 기존에 있는 row보다 수정된 차수가 더 낮은 경우 + // 기존row > 수정row + int gap = 0; + if(existAdrSnSize > changeAdrSnSize) + { + gap = existAdrSnSize - changeAdrSnSize; + for(int i=existAdrSnSize; i > gap; i--) + { + adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(i-1)); + } + } + // 기존에 있는 row보다 수정된 차수가 더 높은 경우 + // 기존row < 수정row + else if(existAdrSnSize < changeAdrSnSize) + { + gap = changeAdrSnSize - existAdrSnSize; + + +// int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + int cnt = existAdrSnSize; // 기존 row size + while(cnt <= changeAdrSnSize) // 수정할 row size + { + System.out.println("cnt : "+cnt); +// adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService +// adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); +// adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); + cnt++; + } + } + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 16bd034e..8d2a1deb 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -24,7 +24,6 @@ import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; -import kcc.com.cmm.service.impl.SequenceUtilServiceImpl; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjPgrMgr.apm.service.ApmService; @@ -33,6 +32,8 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; @@ -76,7 +77,11 @@ public class AdjReqMgrPastController { @Resource(name = "apmService") private ApmService apmService; - + + // 조정신청 서비스단 + @Resource(name = "AdjReqMgrOffLineService") + private AdjReqMgrOffLineService adjReqMgrOffLineService; + // global 프로퍼티 @Resource(name="globalSettings") protected Properties propertiesService; @@ -125,9 +130,8 @@ public class AdjReqMgrPastController { //오프라인 조정 신청 정보 불러오기. AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); - String statCd = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); - resultAdjReqMgrPast.setStatCd(statCd); - + AdjReqMgrPastVO statCdInfo = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); + model.addAttribute("statCdInfo", statCdInfo); model.addAttribute("adrVO", resultAdjReqMgrPast); }else { //기본 값 셋팅 - 대리인 여부, 신청자 분류 @@ -383,39 +387,6 @@ public class AdjReqMgrPastController { return adjReqMgrPastService.deleteAdjReqRecordAjax(adjReqMgrPastVO); } - /** - * @methodName : insertAdjReqMgrOffAjax - * @author : 이호영 - * @date : 2022.08.24 - * @description : 과거사건 기본정보등록 메서드 - * @param multiRequest - * @param adjReqMgrPastVO - * @param redirectAttributes - * @param request - * @return - * @throws Exception - */ - @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"}) - public ResponseEntity insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO - , RedirectAttributes redirectAttributes - , HttpServletRequest request) throws Exception { - - //로그인 권한정보 불러오기 - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - - if(userId.equals("")) { - // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) - return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); - } - - //사용자 유니크 아이디 받아오기 - adjReqMgrPastVO.setFrstRegisterId(userId); - adjReqMgrPastVO.setLastUpdusrId(userId); - - //조정신청, 대리인, 신청인 등록 처리 - return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); - } /** * @methodName : checkNInsertAprvlPastAjax @@ -518,9 +489,95 @@ public class AdjReqMgrPastController { } + + /** + * @methodName : insertAdjReqMgrOffAjax + * @author : 이호영 + * @date : 2022.08.24 + * @description : 과거사건 기본정보등록 메서드 + * @param multiRequest + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"}) + public ResponseEntity insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + //사용자 유니크 아이디 받아오기 + adjReqMgrPastVO.setFrstRegisterId(userId); + adjReqMgrPastVO.setLastUpdusrId(userId); + + //조정신청, 대리인, 신청인 등록 처리 + return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); + } - - + + /** + * @methodName : updateAdrMgrMasterAjax + * @author : 이호영 + * @date : 2022.09.28 + * @description : 과거사건 수정 + * @param multiRequest + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/updateAdjReqMgrPastAjax.do"}) + public ResponseEntity updateAdrMgrMasterAjax(@ModelAttribute("adrVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + //사용자 유니크 아이디 받아오기 + adjReqMgrOffLineVO.setLastUpdusrId(userId); + + /* + * 오프라인 수정 로직 + * 수정 X + * */ + String resultSts = adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO); + + AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); + + adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq()); + adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK + adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명 + adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK + adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명 + adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드 + adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK + adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수 + adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과 + + /* + * 기존 수정로직 후 기타사항 수정 + * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과 + * */ + adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrPastVO); + + if(resultSts.equals("updateSucc")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 수정하였습니다.", adjReqMgrOffLineVO.getAdrSeq(), LocalDateTime.now())); + } + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "수정 중 오류가 발생하였습니다.", LocalDateTime.now())); + } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index a4cfe669..bb6a8790 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -386,8 +386,10 @@ + + + UPDATE ADR_MGR_MASTER SET + REQ_CN1 = #reqCn1# + ,REQ_CN2 = #reqCn2# + ,REQ_TY = #reqTy# + ,CC_TY = #ccTy# + ,ATCH_FILE_ID = #atchFileId# + ,LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND ADR_SEQ = #adrSeq# + + + + + + + + UPDATE ADR_RPPL SET + RPPL_TY = #rpplTy# + ,AGNT_YN = #agntYn# + ,RPPL_USR_TY = #rpplUsrTy# + ,RPPL_NM = #rpplNm# + ,RPPL_BIZ_NO = #rpplBizNo# + ,RPPL_BIZ_ID = #rpplBizId# + ,RPPL_BIZ_NM = #rpplBizNm# + ,RPPL_POST = #rpplPost# + ,RPPL_ADDR = #rpplAddr# + ,RPPL_ADDR_DTL = #rpplAddrDtl# + ,RPPL_REAL_POST = #rpplRealPost# + ,RPPL_REAL_ADDR = #rpplRealAddr# + ,RPPL_REAL_ADDR_DTL = #rpplRealAddrDtl# + ,RPPL_PHONE = #rpplPhone# + ,RPPL_EMAIL = #rpplEmail# + ,RPPL_EMAIL_YN = #rpplEmailYn# + ,RPPL_SMS_YN = #rpplSmsYn# + ,RPPL_CLASS = #rpplClass# + ,RPPL_GRADE = #rpplGrade# + ,ATCH_FILE_ID = #atchFileId# + ,RPPL_RELATION = #rpplRelation# + ,RPPL_RELATION_ETC = #rpplRelationEtc# + ,LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND ADR_SEQ = #adrSeq# + AND RPPL_SEQ = #rpplSeq# + + + + + UPDATE ADR_MEM_DEPT_MGR_PST SET + MEM_DEPT_NM = #memDeptNm# + WHERE + MEM_PST_SEQ = #memPstSeq# + + + + + UPDATE ADR_ASS_MGR_PST SET + ASS_PST_USR_NM = #assPstUsrNm# + WHERE + ASS_PST_SEQ = #assPstSeq# + + + + UPDATE ADR_HSTRY SET + STAT_CD = #statCd# + WHERE + ADR_HSTRY_SEQ = #adrHstrySeq# + + + + + UPDATE ADR_MGR_DETAIL SET + PST_CN = #pstCn# + WHERE + ADR_SEQ = #adrSeq# + + + + + + DELETE FROM ADR_PRTCL_MGR + WHERE ADR_SEQ = #adrSeq# + AND PRTCL_SEQ = #prtclSeq# + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp index 75897029..0393c30e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp @@ -1553,6 +1553,7 @@ if (obj) data.append("fileFr"+idx, obj.fileObj); }); + console.log('data :', data); $.ajax({ type: "POST", diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 366b848f..43bfa86b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -36,41 +36,39 @@