diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 3cb611c2..25b5c40e 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1709,6 +1709,15 @@ public class AdjstReqWebController { String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + // 조정신청 3step 미리보기 시 신청 취지/원인에 데이터가 없으면 'null data'로 찍혀서 공백을 띄어쓰기 한칸으로 넣기_이준호_221226 + if("".equals(reqCn1)) { + reqCn1 = " "; + } + + if("".equals(reqCn2)) { + reqCn2 = " "; + } + if(!rpplNm.equals("")) { diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 22af4c2f..0c0bc53c 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -1,404 +1,404 @@ -package kcc.kccadr.certDoc.web; - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import com.dreamsecurity.magicline.util.Log; - -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kcc.com.cmm.EgovMessageSource; -import kcc.com.cmm.util.StringUtil; -import kcc.com.utl.user.service.CheckLoginUtil; -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.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; -import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; -import kcc.kccadr.adjPgrMgr.dnt.service.DntService; -import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; -import kcc.kccadr.adjPgrMgr.drt.service.AssVO; -import kcc.kccadr.adjPgrMgr.drt.service.DrtService; -import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; -import kcc.kccadr.adjPgrMgr.drtctr.service.AssCtrVO; -import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; -import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; -import kcc.kccadr.adjRppl.service.AdjRpplService; -import kcc.kccadr.adjRppl.service.AdjRpplVO; -import kcc.kccadr.adjcclt.service.AdjstConciliatorService; -import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; -import kcc.kccadr.cmm.KccadrConstants; -import kcc.let.utl.fcc.service.EgovCryptoUtil; - -/** - * 대국민(사용자) - * 인증을 통한 송달서류 조회 controller 클래스를 정의한다. - * @author 김봉호 - * @since 2022.08.29 - * @version 1.0 - * @see - * - * 
- * << 개정이력(Modification Information) >>
- *
- *   수정일      수정자           수정내용
- *  -------    --------    ---------------------------
- *   2022.08.29  안주영          최초 생성
- *
- *
- */ -@Controller -public class CertDocController { - - //private static final Logger LOGGER = LoggerFactory.getLogger(AdjstChangeDateController.class); - - // eGov 공통 메세지 - @Resource(name = "egovMessageSource") - EgovMessageSource egovMessageSource; - - //로그인 체크 util - @Resource(name = "checkLoginUtil") - private CheckLoginUtil checkLoginUtil; - //암복호화 유틸 - @Resource(name = "egovCryptoUtil") - EgovCryptoUtil egovCryptoUtil; - - @Resource(name = "pgrCmmService") - private PgrCmmService cmmService; - - @Resource(name = "dlvinfoService") - private DlvinfoService dlvinfoService; - - @Resource(name = "drtCtrService") - private DrtCtrService drtCtrService; - - @Resource(name = "dntService") - private DntService dntService; - - @Resource(name = "drtService") - private DrtService drtService; - - @Resource(name="adjstConciliatorService") - private AdjstConciliatorService adjstConciliatorService; - - @Resource(name="adjRpplService") - private AdjRpplService adjRpplService; - - - /** - * 송달문서조회용 SNS 로그인 페이지 - */ - @RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") - public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoVO); - return "/web/kccadr/login/SsoLoginUsrSns"; - - } - - /** - * 송달문서조회용 SNS 로그인 callback 페이지 - */ - @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") - public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { - - model.addAttribute("info", dlvinfoVO); - return "/web/kccadr/login/snsCallBack"; - - } - - - /** - * 송달서류 상세 - */ - @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") - public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { - - AdjRpplVO rpplVO = new AdjRpplVO(); - rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); - - rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); - - - String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); - - String returnUrl = ""; - - System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); - System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); - System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); - /* - * dlvinfoVO.getEmail() :: hehihoho3@naver.com - * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= - * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== - * */ - //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return - - if(!encEmail.equals(rpplVO.getRpplEmail())){ - rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); - rs.addFlashAttribute("logout", "Y"); - returnUrl = dlvinfoVO.getUrl(); - - return "redirect:" + returnUrl; - - //메인페이지로 - //return "redirect:/"; - } - - - //dlvrySeq로 기존 데이터 가져오기 - DlvinfoVO dlvinfoDetail = new DlvinfoVO(); - dlvinfoDetail = dlvinfoService.selectDlvryInfo(dlvinfoVO); - - //로그인 성공 시 adr_dlvry_social 테이블에 값 update - DlvinfoDetailVO dlvSocialVO = new DlvinfoDetailVO(); - dlvSocialVO.setDlvrySeq(dlvinfoVO.getDlvrySeq()); - dlvSocialVO.setRpplSeq(rpplVO.getRpplSeq()); - dlvSocialVO.setSocialType(dlvinfoVO.getSocialType()); // 1:카카오, 2:naver - dlvSocialVO.setDlvryDocTy(dlvinfoDetail.getDlvryDocTy()); - - dlvinfoService.updateAdjustDeliverySocialInfo(dlvSocialVO); - - - if(KccadrConstants.ADR_CLOSE_DOC_TY_80.equals(dlvSocialVO.getDlvryDocTy())) { //확정증명원 - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - //사건 정보 불러오기 - model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); - - //종결문서에서 확정증명서 불러오기 - CloseVO closeVO = new CloseVO(); - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); - - model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); - - returnUrl = "/web/kccadr/certDoc/cfrmDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_10.equals(dlvSocialVO.getDlvryDocTy())) { //기일통지서 - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("info", dntVO); - - if(cmmVO.getSearchKeyword().equals("update")) { - // 조정기일 변경 조회 - DntVO dntNoticeVO = new DntVO(); - dntNoticeVO.setAdrSn(cmmVO.getAdrSn()); - dntNoticeVO.setAdrSeq(cmmVO.getAdrSeq()); - DntVO selectDateNoticeDate = dntService.selectDateNoticeDate(dntNoticeVO); - model.addAttribute("date",selectDateNoticeDate); - } - - returnUrl = "/web/kccadr/certDoc/dntDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_20.equals(dlvSocialVO.getDlvryDocTy())) { //기일조서 - - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - DrtVO drtVO = new DrtVO(); - - drtVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - drtVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - List assList = drtService.selectAssList(drtVO); - - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - //조정위원 정보 불러오기 - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("uiwonInfo", dntVO); - - returnUrl = "/web/kccadr/certDoc/drtDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_30.equals(dlvSocialVO.getDlvryDocTy())) { //조정권고안 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - - //조정기일 배석 정보 불러오기 - DrtCtrVO drtCtrVO = new DrtCtrVO(); - drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); - drtCtrVO.setAdrSn(closeVO.getAdrSn()); - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO pgrCmmVO = new PgrCmmVO(); - pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); - pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); - PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); - - - //직권조정 조서 정보 가져오기 - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - CmntVO cmntVO = new CmntVO(); - cmntVO.setAdrSeq(closeVO.getAdrSeq()); - cmntVO.setAdrSn(closeVO.getAdrSn()); - cmntVO.setCmntSeq(closeVO.getCmntSeq()); - cmntVO.setCmntTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); - - //조정위원 의견 리스트 - model.addAttribute("list", cmmService.selectCmnList(cmntVO)); - - returnUrl = "/web/kccadr/certDoc/armDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_40.equals(dlvSocialVO.getDlvryDocTy())) { //조정조서 - - DrtCtrVO drtCtrVO = new DrtCtrVO(); - - drtCtrVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - drtCtrVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - PgrCmmVO cmmVO = new PgrCmmVO(); - - cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - - //조정기일 배석 정보 불러오기 - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - //조정조서 정보 불러오기 - DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - model.addAttribute("drtCtrVO", resultDrtCtrVO); - - returnUrl = "/web/kccadr/certDoc/drtCtrDetail"; - - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_50.equals(dlvSocialVO.getDlvryDocTy())) { //취하종결통보서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - returnUrl = "/web/kccadr/certDoc/entDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_60.equals(dlvSocialVO.getDlvryDocTy())) { //직권조정결정서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - //조정기일 배석 정보 불러오기 - DrtCtrVO drtCtrVO = new DrtCtrVO(); - drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); - drtCtrVO.setAdrSn(closeVO.getAdrSn()); - List assList = drtCtrService.selectAssList(drtCtrVO); - model.addAttribute("assList", assList); - - //기일조서 정보 불러오기 - PgrCmmVO pgrCmmVO = new PgrCmmVO(); - pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); - pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); - PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); - model.addAttribute("info", info); - - //직권조정 조서 정보 가져오기 - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 - AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); - adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); - adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); - adjstConciliatorVO.setCmntTy(dlvinfoDetail.getDlvryDocTy()); //문서종류 코드 번호 전달 - - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(100); - paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); - - adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); - adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - List cmnList = adjstConciliatorService.selectAdjstRecommendationCommentListGroup(adjstConciliatorVO); - - model.addAttribute("cmnList",cmnList); - - returnUrl = "/web/kccadr/certDoc/oadDetail"; - - } else if(KccadrConstants.ADR_CLOSE_DOC_TY_70.equals(dlvSocialVO.getDlvryDocTy())) { //불성립조정통보서 - - CloseVO closeVO = new CloseVO(); - - closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); - closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - returnUrl = "/web/kccadr/certDoc/crtDetail"; - - } - - return returnUrl; - - } - - - @SuppressWarnings("unused") - private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { - PgrCmmVO dntVO = cmmService.selectPgrCmm(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; - } - -} +package kcc.kccadr.certDoc.web; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.dreamsecurity.magicline.util.Log; + +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.EgovMessageSource; +import kcc.com.cmm.util.StringUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +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.adjPgrMgr.dlvinfo.service.DlvinfoDetailVO; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.adjPgrMgr.dnt.service.DntService; +import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; +import kcc.kccadr.adjPgrMgr.drt.service.AssVO; +import kcc.kccadr.adjPgrMgr.drt.service.DrtService; +import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjPgrMgr.drtctr.service.AssCtrVO; +import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; +import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; +import kcc.kccadr.adjcclt.service.AdjstConciliatorService; +import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; +import kcc.kccadr.cmm.KccadrConstants; +import kcc.let.utl.fcc.service.EgovCryptoUtil; + +/** + * 대국민(사용자) + * 인증을 통한 송달서류 조회 controller 클래스를 정의한다. + * @author 김봉호 + * @since 2022.08.29 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2022.08.29  안주영          최초 생성
+ *
+ *
+ */ +@Controller +public class CertDocController { + + //private static final Logger LOGGER = LoggerFactory.getLogger(AdjstChangeDateController.class); + + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + + @Resource(name = "dlvinfoService") + private DlvinfoService dlvinfoService; + + @Resource(name = "drtCtrService") + private DrtCtrService drtCtrService; + + @Resource(name = "dntService") + private DntService dntService; + + @Resource(name = "drtService") + private DrtService drtService; + + @Resource(name="adjstConciliatorService") + private AdjstConciliatorService adjstConciliatorService; + + @Resource(name="adjRpplService") + private AdjRpplService adjRpplService; + + + /** + * 송달문서조회용 SNS 로그인 페이지 + */ + /*@RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") + public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + + model.addAttribute("info", dlvinfoVO); + return "/web/kccadr/login/SsoLoginUsrSns"; + + }*/ + + /** + * 송달문서조회용 SNS 로그인 callback 페이지 + */ + @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") + public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + + model.addAttribute("info", dlvinfoVO); + return "/web/kccadr/login/snsCallBack"; + + } + + + /** + * 송달서류 상세 + */ + @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") + public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { + + AdjRpplVO rpplVO = new AdjRpplVO(); + rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); + + rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); + + + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()).trim(); + + String returnUrl = ""; + + System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); + System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); + System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); + /* + * dlvinfoVO.getEmail() :: hehihoho3@naver.com + * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= + * rpplVO.getRpplEmail() :: mrPLsRpt72UNCRSsLGnZnQ== + * */ + //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return + + if(!encEmail.equals(rpplVO.getRpplEmail())){ + rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); + rs.addFlashAttribute("logout", "Y"); + returnUrl = dlvinfoVO.getUrl(); + + return "redirect:" + returnUrl; + + //메인페이지로 + //return "redirect:/"; + } + + + //dlvrySeq로 기존 데이터 가져오기 + DlvinfoVO dlvinfoDetail = new DlvinfoVO(); + dlvinfoDetail = dlvinfoService.selectDlvryInfo(dlvinfoVO); + + //로그인 성공 시 adr_dlvry_social 테이블에 값 update + DlvinfoDetailVO dlvSocialVO = new DlvinfoDetailVO(); + dlvSocialVO.setDlvrySeq(dlvinfoVO.getDlvrySeq()); + dlvSocialVO.setRpplSeq(rpplVO.getRpplSeq()); + dlvSocialVO.setSocialType(dlvinfoVO.getSocialType()); // 1:카카오, 2:naver + dlvSocialVO.setDlvryDocTy(dlvinfoDetail.getDlvryDocTy()); + + dlvinfoService.updateAdjustDeliverySocialInfo(dlvSocialVO); + + + if(KccadrConstants.ADR_CLOSE_DOC_TY_80.equals(dlvSocialVO.getDlvryDocTy())) { //확정증명원 + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + //사건 정보 불러오기 + model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); + + //종결문서에서 확정증명서 불러오기 + CloseVO closeVO = new CloseVO(); + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); + + model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); + + returnUrl = "/web/kccadr/certDoc/cfrmDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_10.equals(dlvSocialVO.getDlvryDocTy())) { //기일통지서 + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + PgrCmmVO dntVO = getDntInfo(cmmVO); + model.addAttribute("info", dntVO); + + if(cmmVO.getSearchKeyword().equals("update")) { + // 조정기일 변경 조회 + DntVO dntNoticeVO = new DntVO(); + dntNoticeVO.setAdrSn(cmmVO.getAdrSn()); + dntNoticeVO.setAdrSeq(cmmVO.getAdrSeq()); + DntVO selectDateNoticeDate = dntService.selectDateNoticeDate(dntNoticeVO); + model.addAttribute("date",selectDateNoticeDate); + } + + returnUrl = "/web/kccadr/certDoc/dntDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_20.equals(dlvSocialVO.getDlvryDocTy())) { //기일조서 + + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + DrtVO drtVO = new DrtVO(); + + drtVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + drtVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + List assList = drtService.selectAssList(drtVO); + + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + + //조정위원 정보 불러오기 + PgrCmmVO dntVO = getDntInfo(cmmVO); + model.addAttribute("uiwonInfo", dntVO); + + returnUrl = "/web/kccadr/certDoc/drtDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_30.equals(dlvSocialVO.getDlvryDocTy())) { //조정권고안 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + + //조정기일 배석 정보 불러오기 + DrtCtrVO drtCtrVO = new DrtCtrVO(); + drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); + drtCtrVO.setAdrSn(closeVO.getAdrSn()); + List assList = drtCtrService.selectAssList(drtCtrVO); + + //기일조서 정보 불러오기 + PgrCmmVO pgrCmmVO = new PgrCmmVO(); + pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); + pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); + PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); + + + //직권조정 조서 정보 가져오기 + model.addAttribute("assList", assList); + model.addAttribute("info", info); + + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); + + CmntVO cmntVO = new CmntVO(); + cmntVO.setAdrSeq(closeVO.getAdrSeq()); + cmntVO.setAdrSn(closeVO.getAdrSn()); + cmntVO.setCmntSeq(closeVO.getCmntSeq()); + cmntVO.setCmntTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + + //조정위원 의견 리스트 + model.addAttribute("list", cmmService.selectCmnList(cmntVO)); + + returnUrl = "/web/kccadr/certDoc/armDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_40.equals(dlvSocialVO.getDlvryDocTy())) { //조정조서 + + DrtCtrVO drtCtrVO = new DrtCtrVO(); + + drtCtrVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + drtCtrVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + PgrCmmVO cmmVO = new PgrCmmVO(); + + cmmVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + cmmVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + + //조정기일 배석 정보 불러오기 + List assList = drtCtrService.selectAssList(drtCtrVO); + + //기일조서 정보 불러오기 + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + //조정조서 정보 불러오기 + DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + model.addAttribute("drtCtrVO", resultDrtCtrVO); + + returnUrl = "/web/kccadr/certDoc/drtCtrDetail"; + + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_50.equals(dlvSocialVO.getDlvryDocTy())) { //취하종결통보서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); + + returnUrl = "/web/kccadr/certDoc/entDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_60.equals(dlvSocialVO.getDlvryDocTy())) { //직권조정결정서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + //조정기일 배석 정보 불러오기 + DrtCtrVO drtCtrVO = new DrtCtrVO(); + drtCtrVO.setAdrSeq(closeVO.getAdrSeq()); + drtCtrVO.setAdrSn(closeVO.getAdrSn()); + List assList = drtCtrService.selectAssList(drtCtrVO); + model.addAttribute("assList", assList); + + //기일조서 정보 불러오기 + PgrCmmVO pgrCmmVO = new PgrCmmVO(); + pgrCmmVO.setAdrSeq(closeVO.getAdrSeq()); + pgrCmmVO.setPrtclSeq(closeVO.getPrtclSeq()); + PgrCmmVO info = cmmService.selectPgrCmm(pgrCmmVO); + model.addAttribute("info", info); + + //직권조정 조서 정보 가져오기 + closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); + model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); + + //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 + AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); + adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); + adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); + adjstConciliatorVO.setCmntTy(dlvinfoDetail.getDlvryDocTy()); //문서종류 코드 번호 전달 + + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(100); + paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); + + adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + List cmnList = adjstConciliatorService.selectAdjstRecommendationCommentListGroup(adjstConciliatorVO); + + model.addAttribute("cmnList",cmnList); + + returnUrl = "/web/kccadr/certDoc/oadDetail"; + + } else if(KccadrConstants.ADR_CLOSE_DOC_TY_70.equals(dlvSocialVO.getDlvryDocTy())) { //불성립조정통보서 + + CloseVO closeVO = new CloseVO(); + + closeVO.setAdrSeq(dlvinfoDetail.getAdrSeq()); + closeVO.setAdrSn(dlvinfoDetail.getAdrSn()); + + model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); + + returnUrl = "/web/kccadr/certDoc/crtDetail"; + + } + + return returnUrl; + + } + + + @SuppressWarnings("unused") + private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { + PgrCmmVO dntVO = cmmService.selectPgrCmm(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; + } + +} diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index 0c1eeec2..65332dd6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -513,7 +513,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -595,7 +595,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp index ac531efc..d4bc27fa 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp @@ -372,7 +372,7 @@ $(document).ready(function() { - + <%--

* 송달정보 URL로 전송하기



@@ -454,7 +454,7 @@ $(document).ready(function() {
- + --%> 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 ca6157a1..cdd30f55 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 @@ -614,7 +614,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -696,7 +696,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp index c761c1e5..e6c1a699 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp @@ -429,7 +429,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -511,7 +511,7 @@
- + --%>
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 717bd27c..4285c412 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 @@ -585,7 +585,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -667,7 +667,7 @@
- + --%>
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 b54ab56d..5dde7971 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 @@ -788,7 +788,7 @@
- + <%--

* 송달정보 URL로 전송하기



@@ -870,7 +870,7 @@
- + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp index b144146d..5350824a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp @@ -596,7 +596,7 @@
- + <%--

* 송달정보 URL로 전송하기



@@ -678,7 +678,7 @@
- + --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp index 3f82dc66..55f1214d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp @@ -437,7 +437,7 @@ - + <%--

* 송달정보 URL로 전송하기



@@ -519,7 +519,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp index ac3cc05d..3d263c3e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp @@ -508,7 +508,7 @@
- + <%--

* 송달정보 URL로 전송하기



@@ -590,7 +590,7 @@ - + --%>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp index 51886759..6b7c0d35 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp @@ -92,7 +92,7 @@ result = false; return false; } - if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) { + /* if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) { alert('이메일1을 입력해 주세요.'); $('input[name=rpplEmail01]').eq(idx).focus(); result = false; @@ -103,7 +103,7 @@ $('input[name=rpplEmail02]').eq(idx).focus(); result = false; return false; - } + } */ if (isEmpty($('select[name=rpplPhone01]').eq(idx).val())) { alert('연락처1를 입력해 주세요.'); $('select[name=rpplPhone01]').eq(idx).focus(); @@ -317,18 +317,18 @@ -

+

이메일

- "> + " onkeyup="onlyAlphabetNumberEmail(this)"> @ - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> - "> + " onkeyup="onlyNumber(this)"> - - "> + " onkeyup="onlyNumber(this)"> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp index ab3b539e..aecf7400 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp @@ -383,18 +383,18 @@ function fn_submit(){ -

+

이메일

"> - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> @ - "> + " onkeyup="onlyAlphabetNumberEmail(this)"> <%-- - - "> + " onkeyup="onlyNumber(this)"> - - "> + " onkeyup="onlyNumber(this)"> "> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 53a06c6c..5b0212ae 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -525,9 +525,11 @@ var AdjstReq = { }, step3Save : function(mode, previewYn, adrSeq){ // previewYn : 조정신청등록 3단계 미리보기 버튼 클릭시 > 3단계 저장 처리후 팝업오픈 - if(!this.validStep(this.STEP)){ - return false; - } + if(previewYn != 'Y'){ + if(!this.validStep(this.STEP)){ + return false; + } + } var data = new FormData($("#"+this.STEP)[0]); //첨부파일 등록 처리 @@ -549,12 +551,13 @@ var AdjstReq = { // 등록 구분 코드 삽입.. data.append("mode" , mode); - - if(!confirm(msg)){ - if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 - AdjstReq.fncGoPrev(); - } - return false; + if(previewYn != 'Y'){ + if(!confirm(msg)){ + if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 + AdjstReq.fncGoPrev(); + } + return false; + } } var depth = this.expDivision(this.STEP); @@ -572,7 +575,9 @@ var AdjstReq = { cache: false, success: function (returnData, status) { if(returnData.result == 'SUCCESS'){ - alert(endMsg); + if(previewYn != 'Y'){ + alert(endMsg); + } $("#atchFileId").val(returnData.rsVO.atchFileId); if(mode == "${KccadrConstants.ADR_MODE_SMT}"){ AdjstReq.fncGoMyAdjstListPage();