diff --git a/src/main/java/kcc/com/cmm/util/IpUtil.java b/src/main/java/kcc/com/cmm/util/IpUtil.java index 5a6d7e15..47863ef3 100644 --- a/src/main/java/kcc/com/cmm/util/IpUtil.java +++ b/src/main/java/kcc/com/cmm/util/IpUtil.java @@ -99,7 +99,7 @@ public class IpUtil { if(serverNm.contains("localhost") || serverNm.contains("119.193.215.98") || serverNm.contains("iten.co.kr")) {//로컬 및 개발서버 요청시 서버 경로 처리 - ozServerNm = "http://192.168.0.176:8086"; + ozServerNm = "http://119.193.215.98:8086"; }else if(serverNm.contains("192.168.39.144")) {//저작위 업무시스템망에서 오즈 요청시 오즈 서버 경로 처리 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 26b06502..690ca1a3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmService.java @@ -101,5 +101,11 @@ public interface ApmService { ApmVO selectAdrAdmMemo(ApmVO apmVO) throws Exception; void updateAdrAdmMemo(ApmVO apmVO) throws Exception; + + //사건메모 select + ApmVO selectAdrMemo(ApmVO apmVO) throws Exception; + + //사건메모 update(등록/수정/삭제) + void updateAdrMemo(ApmVO apmVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmVO.java index d1eb79e7..70c1d927 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/ApmVO.java @@ -46,6 +46,8 @@ public class ApmVO extends PgrCmmVO implements Serializable { private String adrAdmMemo; + private String adrCn; /* 사건메모 */ + public String getRpplDocSeq() { @@ -295,6 +297,14 @@ public class ApmVO extends PgrCmmVO implements Serializable { public void setAdrAdmMemo(String adrAdmMemo) { this.adrAdmMemo = adrAdmMemo; } + + public String getAdrCn() { + return adrCn; + } + + public void setAdrCn(String adrCn) { + this.adrCn = adrCn; + } 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 d7f3b48f..5e8fa653 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 @@ -198,5 +198,13 @@ public class ApmDAO extends EgovAbstractDAO { public void updateAdrAdmMemo(ApmVO apmVO) throws Exception { update("apmDAO.updateAdrAdmMemo", apmVO); } + + public ApmVO selectAdrMemo(ApmVO apmVO) throws Exception { + return (ApmVO) select("apmDAO.selectAdrMemo", apmVO); + } + + public void updateAdrMemo(ApmVO apmVO) throws Exception { + update("apmDAO.updateAdrMemo", 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 26b2ffc2..5c25315b 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 @@ -562,6 +562,16 @@ public class ApmServiceImpl implements ApmService { public void updateAdrAdmMemo(ApmVO apmVO) throws Exception { apmDAO.updateAdrAdmMemo(apmVO); } + + @Override + public ApmVO selectAdrMemo(ApmVO apmVO) throws Exception { + return apmDAO.selectAdrMemo(apmVO); + } + + @Override + public void updateAdrMemo(ApmVO apmVO) throws Exception { + apmDAO.updateAdrMemo(apmVO); + } 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 7dcd1640..411a937f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -69,6 +69,7 @@ import kcc.kccadr.adjPgrMgr.ent.service.EntService; import kcc.kccadr.adjPgrMgr.ent.service.EntVO; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrService; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; @@ -197,6 +198,10 @@ public class ApmController { @Resource(name="adrHstryMgrSeqGnrService") private EgovIdGnrService adrHstryMgrSeqGnrService; + // 조정신청 서비스단 + @Resource(name = "AdjReqMgrService") + private AdjReqMgrService adjReqMgrService; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -487,7 +492,14 @@ public class ApmController { model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); //이력값 - 끝 - + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + + adjReqMgrVO.setAdrSeq(cmmVO.getAdrSeq()); + + List person = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO); + decryptInfomation(person ,null); + model.addAttribute("person", person); + return "/kccadr/adjPgrMgr/apm/apmTab0"; } @@ -828,6 +840,72 @@ public class ApmController { } + + /** + * 사건메모 팝업 상세 + * + * @param apmVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "popup/adrMemo.do") + public String adrMemo(@ModelAttribute("apmVO") ApmVO apmVO, ModelMap model) throws Exception { + + //이미 있는메모 정보가져오는 쿼리작성(adr_mgr_master > adr_cn 컬럼) + //등록,수정(merge into) + //삭제(update > '') + //한 팝업에서 동작 + + ApmVO memoVO = new ApmVO(); + + memoVO = apmService.selectAdrMemo(apmVO); + + model.addAttribute("apmVO", apmVO); + model.addAttribute("memoVO", memoVO); + + return "/kccadr/adjPgrMgr/apm/popup/adrMemoPop"; + } + + /** + * 사건메모 등록/수정/삭제 + * + * @param apmVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "popup/updateAdrMemoAjax.do") + public ModelAndView updateAdrMemoAjax( + @ModelAttribute("apmVO") ApmVO apmVO + , ModelMap model + , HttpServletRequest request) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + try { + //최종수정자 set + apmVO.setLastUpdusrId(userId); + + //등록, 수정, 삭제 모두 update + apmService.updateAdrMemo(apmVO); + + modelAndView.addObject("result", "success"); + + } catch (Exception e) { + System.out.println(e.getMessage()); + modelAndView.addObject("result", "fail"); + } + + return modelAndView; + + } + + /** * 취하신청 팝업 상세 * @@ -2253,4 +2331,48 @@ public class ApmController { model.addAttribute("reqfileList", apmService.selectAdrReqFileList(apmVO)); } + public void decryptInfomation(List list, AdjReqMgrVO info){ + if(CollectionUtils.isNotEmpty(list)){ + for(AdjReqMgrVO model : list){ + model.setRpplNm(egovCryptoUtil.decrypt(model.getRpplNm())); + model.setRpplAddr(egovCryptoUtil.decrypt(model.getRpplAddr())); + model.setRpplAddrDtl(egovCryptoUtil.decrypt(model.getRpplAddrDtl())); + model.setRpplPost(egovCryptoUtil.decrypt(model.getRpplPost())); + model.setRpplEmail(egovCryptoUtil.decrypt(model.getRpplEmail())); + model.setRpplPhone(egovCryptoUtil.decrypt(model.getRpplPhone())); + model.setRpplRealPost(egovCryptoUtil.decrypt(model.getRpplRealPost())); + model.setRpplRealAddr(egovCryptoUtil.decrypt(model.getRpplRealAddr())); + model.setRpplRealAddrDtl(egovCryptoUtil.decrypt(model.getRpplRealAddrDtl())); + model.setDepuTyNm(egovCryptoUtil.decrypt(model.getDepuTyNm())); +// model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); + + if (!StringUtil.isEmpty(model.getResPonDentNm())) { + String tmpStr = ""; + if(model.getResPonDentNm().contains("외")) { + tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); + } + model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + } + + model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); + + } + } + + if(info != null){ + info.setRpplNm(egovCryptoUtil.decrypt(info.getRpplNm())); + info.setRpplAddr(egovCryptoUtil.decrypt(info.getRpplAddr())); + info.setRpplAddrDtl(egovCryptoUtil.decrypt(info.getRpplAddrDtl())); + info.setRpplPost(egovCryptoUtil.decrypt(info.getRpplPost())); + info.setRpplEmail(egovCryptoUtil.decrypt(info.getRpplEmail())); + info.setRpplPhone(egovCryptoUtil.decrypt(info.getRpplPhone())); + info.setDepuTyNm(egovCryptoUtil.decrypt(info.getDepuTyNm())); + info.setResPonDentNm(egovCryptoUtil.decrypt(info.getResPonDentNm())); + info.setAppliCantNm(egovCryptoUtil.decrypt(info.getAppliCantNm())); + info.setRpplRealPost(egovCryptoUtil.decrypt(info.getRpplRealPost())); + info.setRpplRealAddr(egovCryptoUtil.decrypt(info.getRpplRealAddr())); + info.setRpplRealAddrDtl(egovCryptoUtil.decrypt(info.getRpplRealAddrDtl())); + } + } + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java index 6680f189..3050af9c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/web/ArmController.java @@ -38,8 +38,10 @@ import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.advc.service.AdrHstryMgrService; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -89,6 +91,10 @@ public class ArmController { @Resource(name = "adrHstryMgrService") private AdrHstryMgrService adrHstryMgrService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -216,7 +222,18 @@ public class ArmController { DlvinfoVO dlvInfoVO = new DlvinfoVO(); dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + dlvInfoVO.setAdrSeq(closeVO.getAdrSeq()); + dlvInfoVO.setAdrSn(closeVO.getAdrSn()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_30); + + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); CmntVO cmntVO = new CmntVO(); cmntVO.setAdrSeq(closeVO.getAdrSeq()); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java index 13c243d5..e091a59c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cfrm/web/CfrmController.java @@ -35,6 +35,7 @@ import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; @Controller @RequestMapping("/kccadr/adjPgrMgr/cfrm") @@ -58,6 +59,10 @@ public class CfrmController { @Resource(name = "checkAdrProcessUtil") private CheckAdrProcessUtil checkAdrProcessUtil; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -143,7 +148,18 @@ public class CfrmController { dlvInfoVO.setSrcCon("10"); //조정번호 검색 조건 입력 - 10: 사건번호, 20: 신청인/피신청인 이름 dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); //사건번호 입력 dlvInfoVO.setSrcDocty(KccadrConstants.ADR_CLOSE_DOC_TY_80); //송달 문서 종류 코드번호 - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); + dlvInfoVO.setAdrSn(cmmVO.getAdrSn()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); + return "/kccadr/adjPgrMgr/cfrm/cfrmDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java index c324da5c..f02185b0 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/chd/web/ChdController.java @@ -36,9 +36,11 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -91,6 +93,9 @@ public class ChdController { @Resource(name = "dlvinfoService") private DlvinfoService dlvinfoService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -119,7 +124,21 @@ public class ChdController { DlvinfoVO dlvInfoVO = new DlvinfoVO(); dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + dlvInfoVO.setAdrSn(cmmVO.getAdrSn()); + dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); + + //맞는지 모르겠음... 기일통지서? + //dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_10); + + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); + return "/kccadr/adjPgrMgr/chd/chdDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java index 7a457bb3..ac7cfa2a 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/crt/web/CrtController.java @@ -31,8 +31,10 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -73,6 +75,10 @@ public class CrtController { @Resource(name = "dlvinfoService") private DlvinfoService dlvinfoService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -182,8 +188,17 @@ public class CrtController { dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); dlvInfoVO.setSrcDocty("70");//불성립종결통보서 송달 문서 코드번호 - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + dlvInfoVO.setAdrSeq(closeVO.getAdrSeq()); + dlvInfoVO.setAdrSn(closeVO.getAdrSn()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_70); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); return "/kccadr/adjPgrMgr/crt/crtDetail"; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java index 16a82bf2..29dbd949 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java @@ -24,6 +24,15 @@ public interface DlvinfoService { DlvinfoVO selectAdjustDeliveryLatestInfo(DlvinfoVO dlvinfoVO) throws Exception; + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; + + int updateAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception; + + List selectAdjustDeliverySocialList(DlvinfoVO dlvinfoVO) throws Exception; + + DlvinfoVO selectDlvryInfo(DlvinfoVO dlvinfoVO) throws Exception; + + /* * List getDlvryDocTyList(AdrInfoVO adrInfoVO); * diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoVO.java index a15436d3..40fb12e6 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoVO.java @@ -18,6 +18,7 @@ public class DlvinfoVO extends ComDefaultVO implements Serializable { private String srcTxt; private String frstRegistPnttm; + private String lastUpdtPnttm; private String adrSeq; private String rpplTy; private String rpplTyTxt; @@ -37,7 +38,14 @@ public class DlvinfoVO extends ComDefaultVO implements Serializable { private String lastUpdusrId; private String adrNo; - + + //adr_dlvry_social + private String rpplSeq; + private String socialType; //1 : 카카오톡, 2 : naver + private String email; + private String url; + private String[] rpplSeqs; + private String openDt; public String getSrcDlvSts() { return srcDlvSts; @@ -81,7 +89,15 @@ public class DlvinfoVO extends ComDefaultVO implements Serializable { this.frstRegistPnttm = frstRegistPnttm; } - public String getAdrSeq() { + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + + public String getAdrSeq() { return adrSeq; } @@ -209,6 +225,55 @@ public class DlvinfoVO extends ComDefaultVO implements Serializable { this.adrNo = adrNo; } + public String getRpplSeq() { + return rpplSeq; + } + + public void setRpplSeq(String rpplSeq) { + this.rpplSeq = rpplSeq; + } + + public String getSocialType() { + return socialType; + } + + public void setSocialType(String socialType) { + this.socialType = socialType; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String[] getRpplSeqs() { + return rpplSeqs; + } + + public void setRpplSeqs(String[] rpplSeqs) { + this.rpplSeqs = rpplSeqs; + } + + public String getOpenDt() { + return openDt; + } + + public void setOpenDt(String openDt) { + this.openDt = openDt; + } + + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java index 33c50a43..7b252367 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java @@ -47,4 +47,21 @@ public class DlvinfoDAO extends EgovAbstractDAO { return (DlvinfoVO) select("Dlvinfo.selectAdjustDeliveryLatestInfo", dlvinfoVO); } + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception{ + insert("Dlvinfo.insertAdjustDeliverySocialInfo", dlvinfoDetailVO); + } + + public int updateAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception { + return (Integer) update("Dlvinfo.updateAdjustDeliverySocialInfo", dlvinfoDetailVO); + } + + @SuppressWarnings("unchecked") + public List selectAdjustDeliverySocialList(DlvinfoVO dlvinfoVO) throws Exception { + return (List) list("Dlvinfo.selectAdjustDeliverySocialList", dlvinfoVO); + } + + public DlvinfoVO selectDlvryInfo(DlvinfoVO dlvinfoVO) throws Exception { + return (DlvinfoVO) select("Dlvinfo.selectDlvryInfo", dlvinfoVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java index 468f442a..4406f0be 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java @@ -125,6 +125,35 @@ public class DlvinfoServiceImpl implements DlvinfoService { return dlvinfoDAO.selectAdjustDeliveryLatestInfo(dlvinfoVO); } + @Override + public void insertAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception { + + for(String target : dlvinfoDetailVO.getRpplSeqs()) { + dlvinfoDetailVO.setRpplSeq(target); + + dlvinfoDetailVO.setUrl("http://localhost:8089/web/kccadr/certDoc/snsLoginPage.do?rpplSeq="+dlvinfoDetailVO.getRpplSeq()+"&dlvrySeq="+dlvinfoDetailVO.getDlvrySeq()); + + dlvinfoDAO.insertAdjustDeliverySocialInfo(dlvinfoDetailVO); + } + + } + + @Override + public int updateAdjustDeliverySocialInfo(DlvinfoDetailVO dlvinfoDetailVO) throws Exception { + return dlvinfoDAO.updateAdjustDeliverySocialInfo(dlvinfoDetailVO); + } + + + @Override + public List selectAdjustDeliverySocialList(DlvinfoVO dlvinfoVO) throws Exception { + return dlvinfoDAO.selectAdjustDeliverySocialList(dlvinfoVO); + } + + @Override + public DlvinfoVO selectDlvryInfo(DlvinfoVO dlvinfoVO) throws Exception { + return dlvinfoDAO.selectDlvryInfo(dlvinfoVO); + } + /** * 신청인, 피신청인 복호화 diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java index 0e85378f..01f306da 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/web/DlvinfoController.java @@ -412,6 +412,39 @@ public class DlvinfoController { return modelAndView; } + /** + * 송달정보 전달 URL 등록 Ajax + * + * @param dlvinfoVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("dlvinfoUrlInsertAjax.do") + public ModelAndView dlvinfoUrlInsertAjax(@ModelAttribute("dlvinfoDetailVO") DlvinfoDetailVO dlvinfoDetailVO, ModelMap model, RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception { + + // 로그인 정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + dlvinfoDetailVO.setFrstRegisterId(userId); + dlvinfoDetailVO.setLastUpdusrId(userId); + //////////////////////////////////////// + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + try { + dlvinfoService.insertAdjustDeliverySocialInfo(dlvinfoDetailVO); + modelAndView.addObject("result", "success"); + }catch (Exception e) { + modelAndView.addObject("message", "다시 시도 부탁드립니다."); + modelAndView.addObject("result", "fail"); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + } /** * 송달등록 팝업 @@ -426,6 +459,34 @@ public class DlvinfoController { return "/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop"; } + + /** + * 송달정보 전달 팝업 + * + * @param dlvinfoVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "popup/dlvInfoUrlPop.do") + public String dlvInfoUrlPop(@ModelAttribute("dlvinfoDetailVO") DlvinfoDetailVO dlvinfoDetailVO, ModelMap model) throws Exception { + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(dlvinfoDetailVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(dlvinfoDetailVO.getPageUnit()); + paginationInfo.setPageSize(dlvinfoDetailVO.getPageSize()); + + dlvinfoDetailVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + dlvinfoDetailVO.setLastIndex(paginationInfo.getLastRecordIndex()); + dlvinfoDetailVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + paginationInfo.setTotalRecordCount(dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvinfoDetailVO)); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("list", dlvinfoService.selectAdjustDeliveryInfoList(dlvinfoDetailVO)); + + return "/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop"; + } /** * 송달 사건검색 팝업 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 b11be931..02e76454 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java @@ -43,6 +43,7 @@ import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -108,6 +109,9 @@ public class DntController { @Value("#{globalSettings['Globals.prod.islocal']}") public void setIslocal(String path) { islocal = path; } + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + /** * 기일지정 상세 TODO daenge 기일지정 상세 * @@ -136,7 +140,16 @@ public class DntController { dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); dlvInfoVO.setAdrSn(cmmVO.getAdrSn()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_10); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); return "/kccadr/adjPgrMgr/dnt/dntDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index fca2a4b8..b217395a 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -41,9 +41,11 @@ import kcc.kccadr.adjPgrMgr.drt.service.AgntVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -108,6 +110,9 @@ public class DrtController { @Resource(name = "dntService") private DntService dntService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -306,9 +311,16 @@ public class DrtController { dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); dlvInfoVO.setAdrSn(drtVO.getAdrSn()); + dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_20); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + model.addAttribute("egovCryptoUtil",egovCryptoUtil); model.addAttribute("assList", assList); model.addAttribute("info", info); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java index 27901a2f..f0213be0 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drtctr/web/DrtCtrController.java @@ -39,9 +39,11 @@ import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonService; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -97,6 +99,9 @@ public class DrtCtrController { @Resource(name="adjstConciliatorService") private AdjstConciliatorService adjstConciliatorService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -150,8 +155,18 @@ public class DrtCtrController { DlvinfoVO dlvInfoVO = new DlvinfoVO(); dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - + dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); + dlvInfoVO.setAdrSn(cmmVO.getAdrSn()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_40); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); + model.addAttribute("assList", assList); model.addAttribute("info", info); return pageUrl; @@ -265,8 +280,17 @@ public class DrtCtrController { DlvinfoVO dlvInfoVO = new DlvinfoVO(); dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); + dlvInfoVO.setAdrSn(cmmVO.getAdrSn()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_40); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); model.addAttribute("assList", assList); model.addAttribute("info", info); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java index a6760ede..c7eeec12 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/ent/web/EntController.java @@ -31,8 +31,10 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; import kcc.kccadr.advc.service.AdrHstryMgrService; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -76,6 +78,9 @@ public class EntController { @Resource(name = "adrHstryMgrService") private AdrHstryMgrService adrHstryMgrService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -183,8 +188,18 @@ public class EntController { dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcDocty("50"); //송달 문서 종류 코드번호 dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); + dlvInfoVO.setAdrSeq(closeVO.getAdrSeq()); + dlvInfoVO.setAdrSn(closeVO.getAdrSn()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_50); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); return "/kccadr/adjPgrMgr/ent/entDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java index 3e18253b..a699cf82 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/oad/web/OadController.java @@ -36,8 +36,10 @@ import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrService; import kcc.kccadr.adjPgrMgr.drtctr.service.DrtCtrVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; +import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ozSchd.web.OzSchdExportUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -83,6 +85,9 @@ public class OadController { @Resource(name = "drtCtrService") private DrtCtrService drtCtrService; + @Resource(name = "egovCryptoUtil") + private EgovCryptoUtil egovCryptoUtil; + // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @Value("#{globalSettings['Globals.prod.islocal']}") @@ -207,7 +212,18 @@ public class OadController { dlvInfoVO.setSrcCon("10"); dlvInfoVO.setSrcDocty("60"); //송달 문서 종류 코드번호 dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); + + dlvInfoVO.setAdrSn(closeVO.getAdrSn()); + dlvInfoVO.setAdrSeq(closeVO.getAdrSeq()); + dlvInfoVO.setDlvryDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_60); + int dlvCnt = dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO); + model.addAttribute("dlvCnt", dlvCnt); + + if(dlvCnt > 0) { + model.addAttribute("dlvSocialList", dlvinfoService.selectAdjustDeliverySocialList(dlvInfoVO)); + } + + model.addAttribute("egovCryptoUtil",egovCryptoUtil); //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 diff --git a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java index 2ace624d..9cdfe43d 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java @@ -19,7 +19,7 @@ import java.util.List; * */ public interface AdjRpplService { - +/* // 조정사건관리인 목록 public List selectXxxList(AdjRpplVO xxxVO) throws Exception; @@ -37,4 +37,6 @@ public interface AdjRpplService { // 조정사건관리인 삭제 (update useYn='N'처리) public void deleteXxx2(AdjRpplVO xxxVO) throws Exception; + */ + public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplVO.java b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplVO.java index 64a46567..c9957fe7 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplVO.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplVO.java @@ -7,116 +7,260 @@ import kcc.com.cmm.ComDefaultVO; @SuppressWarnings("serial") public class AdjRpplVO extends ComDefaultVO implements Serializable { - // 검색조건 - private String srchYear = ""; // 검색 년도 - - // 상세 - private String esntlId = ""; // 로그인ID - private String xxxSeq = ""; // xxx 일련번호 - private String bbsId = ""; // 게시판ID - private String nttId = ""; // 게시글ID - private String atchFileId = ""; // 첨부파일 ID - private String lastUpdusrId = ""; // 최종수정자 ID - private String lastUpdusrNm = ""; // 최종수정자 이름 - private String searchCnd = ""; // 검색 항목 - private String searchWrd = ""; // 검색명 - private String frstRegisterId = ""; // 최조작성자 ID - private String frstRegisterNm = ""; // 최조작성자 이름 + private String adrSeq; + private String rpplSeq; + private String rpplTy; + private String agntYn; + private String rpplUsrTy; + private String adrOlYn; + private String rpplId; + private String rpplNm; + private String rpplBizId; + private String rpplBizNm; + private String rpplBizNo; + private String rpplPost; + private String rpplAddr; + private String rpplAddrDtl; + private String rpplAddrCpYn; + private String rpplRealPost; + private String rpplRealAddr; + private String rpplRearAddrDtl; + private String rpplPhone; + private String rpplEmail; + private String rpplEmailYn; + private String rpplSmsYn; + private String rpplClass; + private String rpplGrade; + private String sbmtYn; + private String sbmtDe; + private String usrCi; + private String apprYn; + private String apprDe; + private String atchFileId; + private String rpplrelation; + private String rpplRelationEtc; + private String rpplConnNo; + private String rpplRltnTy; + private String rpplRltnCn; + private String rpplRespddSeq; - public String getSrchYear() { - return srchYear; + + + public String getAdrSeq() { + return adrSeq; } - - public void setSrchYear(String srchYear) { - this.srchYear = srchYear; + public void setAdrSeq(String adrSeq) { + this.adrSeq = adrSeq; } - - public String getEsntlId() { - return esntlId; + public String getRpplSeq() { + return rpplSeq; } - - public void setEsntlId(String esntlId) { - this.esntlId = esntlId; + public void setRpplSeq(String rpplSeq) { + this.rpplSeq = rpplSeq; } - - public String getXxxSeq() { - return xxxSeq; + public String getRpplTy() { + return rpplTy; } - - public void setXxxSeq(String xxxSeq) { - this.xxxSeq = xxxSeq; + public void setRpplTy(String rpplTy) { + this.rpplTy = rpplTy; } - - public String getBbsId() { - return bbsId; + public String getAgntYn() { + return agntYn; } - - public void setBbsId(String bbsId) { - this.bbsId = bbsId; + public void setAgntYn(String agntYn) { + this.agntYn = agntYn; } - - public String getNttId() { - return nttId; + public String getRpplUsrTy() { + return rpplUsrTy; } - - public void setNttId(String nttId) { - this.nttId = nttId; + public void setRpplUsrTy(String rpplUsrTy) { + this.rpplUsrTy = rpplUsrTy; + } + public String getAdrOlYn() { + return adrOlYn; + } + public void setAdrOlYn(String adrOlYn) { + this.adrOlYn = adrOlYn; + } + public String getRpplId() { + return rpplId; + } + public void setRpplId(String rpplId) { + this.rpplId = rpplId; + } + public String getRpplNm() { + return rpplNm; + } + public void setRpplNm(String rpplNm) { + this.rpplNm = rpplNm; + } + public String getRpplBizId() { + return rpplBizId; + } + public void setRpplBizId(String rpplBizId) { + this.rpplBizId = rpplBizId; + } + public String getRpplBizNm() { + return rpplBizNm; + } + public void setRpplBizNm(String rpplBizNm) { + this.rpplBizNm = rpplBizNm; + } + public String getRpplBizNo() { + return rpplBizNo; + } + public void setRpplBizNo(String rpplBizNo) { + this.rpplBizNo = rpplBizNo; + } + public String getRpplPost() { + return rpplPost; + } + public void setRpplPost(String rpplPost) { + this.rpplPost = rpplPost; + } + public String getRpplAddr() { + return rpplAddr; + } + public void setRpplAddr(String rpplAddr) { + this.rpplAddr = rpplAddr; + } + public String getRpplAddrDtl() { + return rpplAddrDtl; + } + public void setRpplAddrDtl(String rpplAddrDtl) { + this.rpplAddrDtl = rpplAddrDtl; + } + public String getRpplAddrCpYn() { + return rpplAddrCpYn; + } + public void setRpplAddrCpYn(String rpplAddrCpYn) { + this.rpplAddrCpYn = rpplAddrCpYn; + } + public String getRpplRealPost() { + return rpplRealPost; + } + public void setRpplRealPost(String rpplRealPost) { + this.rpplRealPost = rpplRealPost; + } + public String getRpplRealAddr() { + return rpplRealAddr; + } + public void setRpplRealAddr(String rpplRealAddr) { + this.rpplRealAddr = rpplRealAddr; + } + public String getRpplRearAddrDtl() { + return rpplRearAddrDtl; + } + public void setRpplRearAddrDtl(String rpplRearAddrDtl) { + this.rpplRearAddrDtl = rpplRearAddrDtl; + } + public String getRpplPhone() { + return rpplPhone; + } + public void setRpplPhone(String rpplPhone) { + this.rpplPhone = rpplPhone; + } + public String getRpplEmail() { + return rpplEmail; + } + public void setRpplEmail(String rpplEmail) { + this.rpplEmail = rpplEmail; + } + public String getRpplEmailYn() { + return rpplEmailYn; + } + public void setRpplEmailYn(String rpplEmailYn) { + this.rpplEmailYn = rpplEmailYn; + } + public String getRpplSmsYn() { + return rpplSmsYn; + } + public void setRpplSmsYn(String rpplSmsYn) { + this.rpplSmsYn = rpplSmsYn; + } + public String getRpplClass() { + return rpplClass; + } + public void setRpplClass(String rpplClass) { + this.rpplClass = rpplClass; + } + public String getRpplGrade() { + return rpplGrade; + } + public void setRpplGrade(String rpplGrade) { + this.rpplGrade = rpplGrade; + } + public String getSbmtYn() { + return sbmtYn; + } + public void setSbmtYn(String sbmtYn) { + this.sbmtYn = sbmtYn; + } + public String getSbmtDe() { + return sbmtDe; + } + public void setSbmtDe(String sbmtDe) { + this.sbmtDe = sbmtDe; + } + public String getUsrCi() { + return usrCi; + } + public void setUsrCi(String usrCi) { + this.usrCi = usrCi; + } + public String getApprYn() { + return apprYn; + } + public void setApprYn(String apprYn) { + this.apprYn = apprYn; + } + public String getApprDe() { + return apprDe; + } + public void setApprDe(String apprDe) { + this.apprDe = apprDe; } - public String getAtchFileId() { return atchFileId; } - public void setAtchFileId(String atchFileId) { this.atchFileId = atchFileId; } - - public String getLastUpdusrId() { - return lastUpdusrId; + public String getRpplrelation() { + return rpplrelation; } - - public void setLastUpdusrId(String lastUpdusrId) { - this.lastUpdusrId = lastUpdusrId; + public void setRpplrelation(String rpplrelation) { + this.rpplrelation = rpplrelation; } - - public String getLastUpdusrNm() { - return lastUpdusrNm; + public String getRpplRelationEtc() { + return rpplRelationEtc; } - - public void setLastUpdusrNm(String lastUpdusrNm) { - this.lastUpdusrNm = lastUpdusrNm; + public void setRpplRelationEtc(String rpplRelationEtc) { + this.rpplRelationEtc = rpplRelationEtc; } - - public String getSearchCnd() { - return searchCnd; + public String getRpplConnNo() { + return rpplConnNo; } - - public void setSearchCnd(String searchCnd) { - this.searchCnd = searchCnd; + public void setRpplConnNo(String rpplConnNo) { + this.rpplConnNo = rpplConnNo; } - - public String getSearchWrd() { - return searchWrd; + public String getRpplRltnTy() { + return rpplRltnTy; } - - public void setSearchWrd(String searchWrd) { - this.searchWrd = searchWrd; + public void setRpplRltnTy(String rpplRltnTy) { + this.rpplRltnTy = rpplRltnTy; } - - public String getFrstRegisterId() { - return frstRegisterId; + public String getRpplRltnCn() { + return rpplRltnCn; } - - public void setFrstRegisterId(String frstRegisterId) { - this.frstRegisterId = frstRegisterId; + public void setRpplRltnCn(String rpplRltnCn) { + this.rpplRltnCn = rpplRltnCn; } - - public String getFrstRegisterNm() { - return frstRegisterNm; + public String getRpplRespddSeq() { + return rpplRespddSeq; } - - public void setFrstRegisterNm(String frstRegisterNm) { - this.frstRegisterNm = frstRegisterNm; + public void setRpplRespddSeq(String rpplRespddSeq) { + this.rpplRespddSeq = rpplRespddSeq; } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java index ca033065..001e3808 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.kccadr.adjRppl.service.AdjRpplVO; import kcc.kccadr.xxx.service.XxxVO; /** @@ -56,4 +57,8 @@ public class AdjRpplDAO extends EgovAbstractDAO { public void deleteXxx2(XxxVO xxxVO) throws Exception { update("XxxDAO.deleteXxx2", xxxVO); } + + public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) { + return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplDetail", adjRpplVO); + } } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java index f9597c2d..bbb06e7f 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java @@ -10,7 +10,8 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; -import kcc.kccadr.xxx.service.XxxService; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; import kcc.kccadr.xxx.service.XxxVO; /** @@ -29,12 +30,12 @@ import kcc.kccadr.xxx.service.XxxVO; * * */ -@Service("AdjRpplService") -public class AdjRpplServiceImpl extends EgovAbstractServiceImpl implements XxxService { +@Service("adjRpplService") +public class AdjRpplServiceImpl extends EgovAbstractServiceImpl implements AdjRpplService { // XXX DAO @Resource(name = "AdjRpplDAO") - private AdjRpplDAO xxxDAO; + private AdjRpplDAO adjRpplDAO; /** @@ -46,36 +47,41 @@ public class AdjRpplServiceImpl extends EgovAbstractServiceImpl implements XxxS private EgovIdGnrService idgenService; private static final Logger LOGGER = LoggerFactory.getLogger(AdjRpplServiceImpl.class); - +/* // XXX 목록 public List selectXxxList(XxxVO xxxVO) throws Exception { - return xxxDAO.selectXxxList(xxxVO); + return adjRpplDAO.selectXxxList(xxxVO); } // XXX 상세 public XxxVO selectXxxDetail(XxxVO xxxVO) throws Exception { - return xxxDAO.selectXxxDetail(xxxVO); + return adjRpplDAO.selectXxxDetail(xxxVO); } // XXX 등록 public void insertXxx(XxxVO xxxVO) throws Exception { String uniqId = idgenService.getNextStringId(); // 고유ID xxxVO.setXxxSeq(uniqId); - xxxDAO.insertXxx(xxxVO); + adjRpplDAO.insertXxx(xxxVO); } // XXX 수정 public void updateXxx(XxxVO xxxVO) throws Exception { - xxxDAO.updateXxx(xxxVO); + adjRpplDAO.updateXxx(xxxVO); } // XXX 삭제 public void deleteXxx(XxxVO xxxVO) throws Exception { - xxxDAO.deleteXxx(xxxVO); + adjRpplDAO.deleteXxx(xxxVO); } // XXX 삭제 (update useYn='N'처리) public void deleteXxx2(XxxVO xxxVO) throws Exception { - xxxDAO.deleteXxx2(xxxVO); + adjRpplDAO.deleteXxx2(xxxVO); + } +*/ + @Override + public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception { + return adjRpplDAO.selectAdjRpplDetail(adjRpplVO); } } diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 5c8e24d9..5a0890d5 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -1,6 +1,5 @@ package kcc.kccadr.certDoc.web; -import java.util.HashMap; import java.util.List; import javax.annotation.Resource; @@ -9,7 +8,7 @@ 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.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; @@ -19,6 +18,7 @@ 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; @@ -29,6 +29,8 @@ 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; @@ -85,12 +87,17 @@ public class CertDocController { @Resource(name="adjstConciliatorService") private AdjstConciliatorService adjstConciliatorService; + @Resource(name="adjRpplService") + private AdjRpplService adjRpplService; + + /** * 송달문서조회용 SNS 로그인 페이지 */ @RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") - public String snsLoginPage(@RequestParam HashMap test) throws Exception { + public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + model.addAttribute("info", dlvinfoVO); return "/web/kccadr/login/SsoLoginUsrSns"; } @@ -99,286 +106,271 @@ public class CertDocController { * 송달문서조회용 SNS 로그인 callback 페이지 */ @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") - public String snsCallBack(@RequestParam HashMap test) throws Exception { + public String snsCallBack(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception { + model.addAttribute("info", dlvinfoVO); return "/web/kccadr/login/snsCallBack"; } /** - * 송달문서 목록 + * 송달서류 상세 */ - @RequestMapping("/web/kccadr/certDoc/certDocList.do") - public String certDocList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { + @RequestMapping("/web/kccadr/certDoc/certDocInfo.do") + public String dlvDocInfo(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model, RedirectAttributes rs) throws Exception { - return "/web/kccadr/certDoc/certDocList"; + AdjRpplVO rpplVO = new AdjRpplVO(); + rpplVO.setRpplSeq(dlvinfoVO.getRpplSeq()); - } - - /** - * 확정증명원 상세 - */ - @RequestMapping("/web/kccadr/certDoc/cfrmDetail.do") - public String cfrmDetail(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { + rpplVO = adjRpplService.selectAdjRpplDetail(rpplVO); - //TEST CODE START - cmmVO.setAdrSeq("ADR_0000000000002620"); - cmmVO.setAdrSn("1"); - //TEST CODE END - - //사건 정보 불러오기 - model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); + String encEmail = egovCryptoUtil.encrypt(dlvinfoVO.getEmail()); - //종결문서에서 확정증명서 불러오기 - CloseVO closeVO = new CloseVO(); - closeVO.setAdrSeq(cmmVO.getAdrSeq()); - closeVO.setAdrSn(cmmVO.getAdrSn()); - closeVO.setCloseDocTy(KccadrConstants.ADR_CLOSE_DOC_TY_80); - - model.addAttribute("closeDocInfo", cmmService.selectCloseDoc(closeVO)); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); //조정번호 검색 조건 입력 - 10: 사건번호, 20: 신청인/피신청인 이름 - dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); //사건번호 입력 - dlvInfoVO.setSrcDocty(KccadrConstants.ADR_CLOSE_DOC_TY_80); //송달 문서 종류 코드번호 - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - return "/web/kccadr/certDoc/cfrmDetail"; - - } - - /** - * 기일통지서 상세 - */ - @RequestMapping(value = "/web/kccadr/certDoc/dntDetail.do") - public String dntDetail(@ModelAttribute("dntVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { - - //TEST CODE START - cmmVO.setAdrSeq("ADR_0000000000002620"); - cmmVO.setAdrSn("1"); - //TEST CODE END - - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("info", dntVO); + String returnUrl = ""; - 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); + + //둘 다 암호화된 값으로 비교해서 틀렸을 경우 메인페이지로 return + + if(!encEmail.equals(rpplVO.getRpplEmail())){ + rs.addFlashAttribute("returnMsg", "신청정보(이메일)가 일치하지 않습니다."); + + 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"; + } - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - return "/web/kccadr/certDoc/dntDetail"; - } - - /** - * 기일조서 상세 - */ - @RequestMapping(value = "/web/kccadr/certDoc/drtDetail.do") - public String drtDetail(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { - - List assList = drtService.selectAssList(drtVO); - - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcDocty("20"); //송달 문서 종류 코드번호 - dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); - dlvInfoVO.setAdrSeq(cmmVO.getAdrSeq()); - dlvInfoVO.setAdrSn(drtVO.getAdrSn()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - - //조정위원 정보 불러오기 - PgrCmmVO dntVO = getDntInfo(cmmVO); - model.addAttribute("uiwonInfo", dntVO); - - return "/web/kccadr/certDoc/drtDetail"; - } - - /** - * 조정권고안 상세 - */ - @RequestMapping(value = "/web/kccadr/certDoc/armDetail.do") - public String armDetail(@ModelAttribute("closeVO") CloseVO closeVO, ModelMap model) throws Exception { - - //TEST CODE START - closeVO.setAdrSeq("ADR_0000000000002762"); - closeVO.setAdrSn("1"); - //TEST CODE END - - //조정기일 배석 정보 불러오기 - 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("30"); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - CmntVO cmntVO = new CmntVO(); - cmntVO.setAdrSeq(closeVO.getAdrSeq()); - cmntVO.setAdrSn(closeVO.getAdrSn()); - cmntVO.setCmntSeq(closeVO.getCmntSeq()); - cmntVO.setCmntTy("30"); - - //조정위원 의견 리스트 - model.addAttribute("list", cmmService.selectCmnList(cmntVO)); - - return "/web/kccadr/certDoc/armDetail"; - } - - /** - * 조정조서 상세 - */ - @RequestMapping("/web/kccadr/certDoc/drtCtrDetail.do") - public String drtCtrDetail(PgrCmmVO cmmVO, DrtCtrVO drtCtrVO, ModelMap model) throws Exception { - - //조정기일 배석 정보 불러오기 - List assList = drtCtrService.selectAssList(drtCtrVO); - - //기일조서 정보 불러오기 - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - //조정조서 정보 불러오기 - DrtCtrVO resultDrtCtrVO = drtCtrService.selectDrtCtrReport(drtCtrVO); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcTxt(cmmVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - model.addAttribute("drtCtrVO", resultDrtCtrVO); - - return "/web/kccadr/certDoc/drtCtrDetail"; + return returnUrl; } - /** - * 취하종결통보서 상세 - */ - @RequestMapping(value = "/web/kccadr/certDoc/entDetail.do") - public String entDetail(@ModelAttribute("closeVO") CloseVO closeVO, ModelMap model) throws Exception { - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcDocty("50"); //송달 문서 종류 코드번호 - dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); - - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - return "/web/kccadr/certDoc/entDetail"; - } - - /** - * 직권조정결정서 상세 - */ - - @RequestMapping(value = "/web/kccadr/certDoc/oadDetail.do") - public String oadDetail(@ModelAttribute("closeVO") CloseVO closeVO, ModelMap model) throws Exception { - - //조정기일 배석 정보 불러오기 - 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("60"); - model.addAttribute("drtCtrVO", cmmService.selectCloseDoc(closeVO)); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcDocty("60"); //송달 문서 종류 코드번호 - dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - - //조정위원들 의견 정보 불러오기(전체 불러오기 - memSeq로 그룹핑해서 중복 제거했음) 20220209 - 우영두 추가 - AdjstConciliatorVO adjstConciliatorVO = new AdjstConciliatorVO(); - adjstConciliatorVO.setAdrSeq(closeVO.getAdrSeq()); - adjstConciliatorVO.setAdrSn(closeVO.getAdrSn()); - adjstConciliatorVO.setCmntTy(dlvInfoVO.getSrcDocty()); //문서종류 코드 번호 전달 - - 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); - - return "/web/kccadr/certDoc/oadDetail"; - } - - /** - * 불성립종결통보서 상세 - */ - @RequestMapping(value = "crtDetail.do") - public String crtDetail(@ModelAttribute("closeVO") CloseVO closeVO, ModelMap model) throws Exception { - - model.addAttribute("info", cmmService.selectPgrCmm(closeVO)); - - //송달정보 count 조회해오기 - DlvinfoVO dlvInfoVO = new DlvinfoVO(); - dlvInfoVO.setSrcCon("10"); - dlvInfoVO.setSrcTxt(closeVO.getAdrNo()); - dlvInfoVO.setSrcDocty("70");//불성립종결통보서 송달 문서 코드번호 - model.addAttribute("dlvCnt", dlvinfoService.selectAdjustDeliveryInfoListCnt(dlvInfoVO)); - - return "/web/kccadr/certDoc/crtDetail"; - } + @SuppressWarnings("unused") private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); if (!StringUtil.isEmpty(dntVO.getMemNames())) { diff --git a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java index b2acd0c5..d9a0559a 100644 --- a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java +++ b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java @@ -36,4 +36,6 @@ public interface SMSOracleService { // EMAIL 전송(저작위 메일서버) public String insertEmailSend(EgovMap egovMap); + // SMS 작성 메세지 전송(저작위 SMS서버 DB등록) + public String insertSmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java index 1381792e..dae0dced 100644 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java @@ -613,5 +613,66 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM } + // SMS 전송(저작위 SMS서버 DB등록) + @Override + public String insertSmsCustomSend(AdjReqMgrVO adjReqMgrVO) throws Exception { + String result = "fail"; + List sendMapList = getSmsSendMsg(adjReqMgrVO); // 전송 메세지 > 전자조정DB + + if (sendMapList == null || sendMapList.isEmpty()) { + return result; + } + + try { + for (EgovMap map : sendMapList) { + + // test 수신자 번호 여현준 + //map.put("rpplPhone", "010-8532-6650"); + // test + + map.put("sendTelNo", sendTelNo); // 송신자 번호 + map.put("trId", trId); // 시스템 구분자 + + String sendMsg = (String) map.get("sendMsg"); + int bytes = sendMsg.getBytes("euc-kr").length; + + String rpplPhone = (String) map.get("rpplPhone"); + String rpplEmail = (String) map.get("rpplEmail"); + String rpplSmsYn = (String) map.get("rpplSmsYn"); + String rpplEmailYn = (String) map.get("rpplEmailYn"); + + String emailResult = "N"; + if (rpplEmailYn != null && rpplEmailYn.equals("Y") && StringUtil2.isNotEmpty(rpplEmail)) { // 메일 수신여부 +// emailResult = insertEmailSend(map); + } + + map.put("emailSendResult", emailResult); + + if (rpplSmsYn != null && rpplSmsYn.equals("Y") && StringUtil2.isNotEmpty(rpplPhone)) { // 문자 수신여부 + if (bytes > 90) { + sMSOracleDAO.insertMmsSend(map); // SMS 등록 장문 > SMS DB(오라클) + adjReqMgrDAO.insertAdrMmsSend(map); // SMS 이력 등록 장문 > 전자조정 + } else { + sMSOracleDAO.insertSmsSend(map); // SMS 등록 단문 > SMS DB(오라클) + adjReqMgrDAO.insertAdrSmsSend(map); // SMS 이력 등록 단문 > 전자조정 + } + //sms 발송 관리 테이블에 저장 + msgMgrDAO.insertAdrSmsLog(map); // SMS 이력 등록 단문 > 전자조정 + } else { // 메일만 보낼시 단문테이블에라도 이력 등록 + adjReqMgrDAO.insertAdrSmsSend(map); // SMS 이력 등록 단문 > 전자조정 + //sms 발송 관리 테이블에 저장 + msgMgrDAO.insertAdrSmsLog(map); // SMS 이력 등록 단문 > 전자조정 + } + + result = "succ"; + } + } catch (Exception e) { + System.out.println("Exception Occured!!!"); + } + + LOGGER.debug("SMS 전송DB 등록 결과:[" + result +"]"); + return result; + } + } diff --git a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjrppl.xml b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjrppl.xml new file mode 100644 index 00000000..92edd836 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-kccadr-adjrppl.xml @@ -0,0 +1,8 @@ + + + + + + + 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 d9f7a556..6046b849 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 @@ -1040,6 +1040,24 @@ + + + + + UPDATE adr_mgr_master + SET adr_cn = #adrCn#, + last_updusr_id = #lastUpdusrId#, + last_updt_pnttm = NOW() + WHERE adr_seq = #adrSeq# + + 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 a2d625bb..2805dfb5 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 @@ -355,7 +355,7 @@ LEFT JOIN ADR_APP_MGR AM ON M.ADR_SEQ = AM.ADR_SEQ AND D.ADR_SN = AM.ADR_SN AND ZAM.APP_SEQ = AM.APP_SEQ - LEFT JOIN (SELECT * FROM ADR_PRTCL_MGR a ORDER BY a.prtcl_seq DESC LIMIT 1) APM ON APM.ADR_SEQ = M.ADR_SEQ AND APM.ADR_SN = D.ADR_SN + LEFT JOIN (SELECT * FROM ADR_PRTCL_MGR a where a.adr_seq = M.ADR_SEQ ORDER BY a.prtcl_seq DESC LIMIT 1) APM ON APM.ADR_SEQ = M.ADR_SEQ AND APM.ADR_SN = D.ADR_SN LEFT JOIN ADR_AVOID_CMT_MGR AV ON AV.ADR_SEQ = M.ADR_SEQ AND AV.ADR_SN = D.ADR_SN LEFT OUTER JOIN ( SELECT diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml index edb0e03b..52368e38 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml @@ -40,6 +40,9 @@ AND D.ADR_SN = #adrSn# + + AND D.DLVRY_DOC_TY = #dlvryDocTy# + @@ -164,6 +167,29 @@ LIMIT 1 + + UPDATE ADR_DLVRY SET @@ -186,8 +212,6 @@ AND DLVRY_SEQ = #dlvrySeq# - - INSERT INTO ADR_DLVRY ( ADR_SEQ @@ -309,5 +333,59 @@ AND AP.RPPL_TY = '10' WHERE M.ADR_NO= #adrNo# + + + + INSERT INTO ADR_DLVRY_SOCIAL ( + DLVRY_SEQ + ,RPPL_SEQ + ,URL + ,frst_regist_pnttm + ) + SELECT + #dlvrySeq#, #rpplSeq#, #url#, SYS_DATETIME FROM DUAL + WHERE NOT EXISTS (SELECT 1 + FROM + ADR_DLVRY_SOCIAL + WHERE + DLVRY_SEQ = #dlvrySeq# + AND + RPPL_SEQ = #rpplSeq#) + + + + UPDATE + ADR_DLVRY_SOCIAL + SET + SOCIAL_TYPE = #socialType# + , open_dt = IFNULL(open_dt, SYS_DATETIME) + , last_updt_pnttm = SYS_DATETIME + WHERE + 1=1 + AND + DLVRY_SEQ = #dlvrySeq# + AND + RPPL_SEQ = #rpplSeq# + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml new file mode 100644 index 00000000..ec10642a --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml @@ -0,0 +1,64 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index d8aae977..f1a4126d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -307,6 +307,12 @@ $(document).ready(function(){ }); }); /*//워크플로우 */ + //조정사건메모 + function fncAdrMemo() { + + var pop = document.pop; + commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adrMemo.do", '820', '500', "adrMemoPop", $('#pop')); + } @@ -407,417 +413,14 @@ $(document).ready(function(){ " />
- - - - - - - - -

조정 사건 일반

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
사건 -

- - - () - -

- - - - 		사건내용 -

- - -

-
신청인 -

- - - - -

- 		대리인 -

- - - - - - - -

-
피신청인 -

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

- 		대리인 -

- - - - - - - - - - - -

-
신청일 -

- -

- 		처리일자 -

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

- - - -
조정부 -

- - -

- 		조정 조사관 -

- - - - -

-
진행상태 -

- - - ( 결재 대기 중) - -

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

조정기일 차

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
조정부 -

- -

-
차수 -

- - 차 -

-
사건 -

- -

- 		사건내용 -

- -

-
신청인 -

- -

- 		대리신청인 -

- -

-
피신청인 -

- -

- 		대리신청인 -

- -

-
조정기일 -

- - -

- - - - - - - - -
장소 -

- - <%-- --%> -

-
주소 -

- - <%-- --%> -

-
조정부장 -

- -

-
조정위원 -

- - - - 기피신청노출 - - - - -

-
조정조사관 -

- -

-
기일조정 결과 -

- - - - - - - - - - -

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

종결결재 반려 첨부파일

-
- - - - - - - - - - - -
조정조사관 -

- -

-
-
- --%> - - -
+
개발용 코드 노출 삭제 예정임/${info.statCd}/ +
-
- -
+ -
@@ -1319,32 +922,689 @@ $(document).ready(function(){ public static final String ADR_CLOSE_APPR_COMP = "309050"; // 종결결재완료 --> -
-
- - -
-
- - - - + + + + <%-- + + + + --%>
-
+
- -
-
- + + + + +
+ --> + + + + +

+ 조정 사건 일반 + +

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

+ + + () + +

+ + + + 		사건내용 +

+ + +

+
신청인 +

+ + + + +

+ 		대리인 +

+ + + + + + + +

+
피신청인 +

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

+ 		대리인 +

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

+
신청일 +

+ +

+ 		처리일자 +

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

+ + + +
조정부 +

+ + +

+ 		조정 조사관 +

+ + + + +

+
진행상태 +

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

+
+
+ + + +

신청인정보

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

피신청인정보

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

신청인정보

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

신청인 분류

+ 		+ +
+

신청인 이름

+
+

주소

+ 		+ () + +
+

이메일

+
+

연락처

+
+

이메일 수신여부

+
+

SMS 수신여부

+
+

우편물 수령지

+ 		+ () + +
+
+ + +

대리인정보

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

대리인 이름

+
+

본인과의 관계

+ 		+ + + () + +
+

직책

+
+

대리인 주소

+ 		+ () + +
+

이메일

+
+

연락처

+
+

이메일 수신여부

+
+

SMS 수신여부

+
+

우편물 수령지

+ 		+ () + +
+

첨부파일

+ 		+ + + +
+
+ + +

피신청인${rpplCnt} 정보

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

피신청인 분류

+
+

피신청인 이름

+
+

주소

+ 		+ () + +
+

이메일

+
+

연락처

+
+

이메일 수신여부

+
+

SMS 수신여부

+
+

우편물 수령지

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

조정기일 차

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

+ +

+
차수 +

+ + 차 +

+
사건 +

+ +

+ 		사건내용 +

+ +

+
신청인 +

+ +

+ 		대리신청인 +

+ +

+
피신청인 +

+ +

+ 		대리신청인 +

+ +

+
조정기일 +

+ + +

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

+ + <%-- --%> +

+
주소 +

+ + <%-- --%> +

+
조정부장 +

+ +

+
조정위원 +

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

+
조정조사관 +

+ +

+
기일조정 결과 +

+ + + + + + - + + + +

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

종결결재 반려 첨부파일

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

+ +

+
+
+ --%> + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrMemoPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrMemoPop.jsp new file mode 100644 index 00000000..3f9e2558 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrMemoPop.jsp @@ -0,0 +1,90 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> + + +사건메모 + + + + +
+ " /> + +
+
+
+

사건메모

+ + + + + + + + + + + +
내용 +

+
+
+ + + + + + + + +
+
+
+ + 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 99bb15d4..b7fbf93f 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 @@ -16,7 +16,22 @@
" /> - " /> - " /> + " /> + " /> " /> + + + +
" /> @@ -385,15 +463,99 @@
+ + + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + +
- + 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 5b900488..161619ca 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 @@ -15,6 +15,25 @@ @@ -171,6 +248,10 @@ " /> + + + + " /> @@ -288,6 +369,94 @@
+ + + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + + + +
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 a2a09731..03ec10d9 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 @@ -25,6 +25,22 @@ 'timeFormat': 'HH:mm', }); + //송달 정보 SET + var resPonDentId = "${info.resPonDentId}"; //피신청인 rpplSeq 배열 + var resPonDentNm = "${info.resPonDentNm}"; //피신청인 rpplNm 배열 + var splitId = resPonDentId.split(','); + var splitNm = resPonDentNm.split(','); + + var sendBtnHtml = ""; + + for(var i in splitId){ + + sendBtnHtml += ''+splitNm[i].trim()+"
"; + + } + + $("#sendBtnArea").html(sendBtnHtml); + }); function fncGoList(target) { @@ -230,6 +246,11 @@ commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } + function sendDlvInfoUrlPop() { + commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop')); + } + + function sendDlvInfo() { var frm = document.dlvpop; frm.action = ""; @@ -240,15 +261,76 @@ frm.action = ""; frm.submit(); } + + function sendDlvInfoRppl() { + var f = document.getElementById("dlvpop"); + + if(f.dlvrySeq.value == "") { + alert("송달URL을 만들 서류를 선택해주세요."); + return; + } + + if($("input:checkbox[name=rpplSeqs]:checked").length == 0) { + alert("송달URL을 보낼 사람을 선택해주세요."); + return; + } + + var rpplSeqs = []; + $("input:checkbox[name=rpplSeqs]:checked").each(function() { + rpplSeqs.push($(this).val()); + + }); + + f.rpplSeqs.value = rpplSeqs; + + if (confirm("송달정보를 전달하기위해 URL을 생성하시겠습니까?")) { + + var data = new FormData(f); + + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/dlvinfo/dlvinfoUrlInsertAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("송달정보 전달 URL 등록이 완료되었습니다."); + fncGoList("insert"); + } else { + alert(returnData.message); + } + + }, + error : function(e) { + alert("송달정보 전달 URL 등록에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + + } + + } +
" /> + " /> + " /> + " /> + + + +
" /> @@ -415,6 +497,92 @@
+ + + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + +
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 a0442f14..a0f9f769 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 @@ -16,7 +16,22 @@ " /> + " /> + " /> " /> + + + +
" /> @@ -300,13 +379,97 @@
+ + + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + +
- + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.jsp new file mode 100644 index 00000000..c48c813a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.jsp @@ -0,0 +1,158 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> +<% +/** + * @Class Name : dlvinfoPop.jsp + * @Description : 송달정보 등록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.11.11 안주영 최초 생성 + * @author 안주영 + * @since 2021.11.11 + * @version 1.0 + * @see + * + */ +%> + + +송달정보 등록 + + + + + + + " /> + " /> + " /> + + + + + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
송달정보 목록 : 송달일자, 조정번호, 구분, 당사자, 등기번호, 송달서류, 발송일, 송달일
+ 접수일자 + + + 조정번호 + + 구분당사자등기번호송달서류 + 송달발송일자 + + + 송달완료일자 + +
+ + + + + + + + + + + + + + + + + +
+ +
+
+ + + + +
+ +
+ + + +
+
+
+ + + \ No newline at end of file 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 aff709ed..9c461fac 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 @@ -24,7 +24,23 @@ $('input[name=appDeTime]').timepicker({ 'timeFormat': 'HH:mm', }); + + var resPonDentId = "${info.resPonDentId}"; //피신청인 rpplSeq 배열 + var resPonDentNm = "${info.resPonDentNm}"; //피신청인 rpplNm 배열 + var splitId = resPonDentId.split(','); + var splitNm = resPonDentNm.split(','); + var sendBtnHtml = ""; + + for(var i in splitId){ + + sendBtnHtml += ''+splitNm[i].trim()+"
"; + + + } + + $("#sendBtnArea").html(sendBtnHtml); + }); function fncGoList(target) { @@ -252,6 +268,10 @@ commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } + function sendDlvInfoUrlPop() { + commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop')); + } + function sendDlvInfo() { var frm = document.dlvpop; frm.action = ""; @@ -262,6 +282,59 @@ frm.action = ""; frm.submit(); } + + function sendDlvInfoRppl() { + var f = document.getElementById("dlvpop"); + + if(f.dlvrySeq.value == "") { + alert("송달URL을 만들 서류를 선택해주세요."); + return; + } + + if($("input:checkbox[name=rpplSeqs]:checked").length == 0) { + alert("송달URL을 보낼 사람을 선택해주세요."); + return; + } + + var rpplSeqs = []; + $("input:checkbox[name=rpplSeqs]:checked").each(function() { + rpplSeqs.push($(this).val()); + + }); + + f.rpplSeqs.value = rpplSeqs; + + if (confirm("송달정보를 전달하기위해 URL을 생성하시겠습니까?")) { + + var data = new FormData(f); + + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/dlvinfo/dlvinfoUrlInsertAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("송달정보 전달 URL 등록이 완료되었습니다."); + fncGoList("insert"); + } else { + alert(returnData.message); + } + + }, + error : function(e) { + alert("송달정보 전달 URL 등록에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + + } + + } @@ -271,6 +344,10 @@ " /> + + + +
" /> @@ -435,6 +512,92 @@
+ + + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + +
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 01bef45b..19f83d03 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 @@ -29,6 +29,23 @@ $('input[name=nextAppDeTime]').timepicker({ 'timeFormat': 'HH:mm', }); + + //송달 정보 SET + var resPonDentId = "${info.resPonDentId}"; //피신청인 rpplSeq 배열 + var resPonDentNm = "${info.resPonDentNm}"; //피신청인 rpplNm 배열 + var splitId = resPonDentId.split(','); + var splitNm = resPonDentNm.split(','); + + var sendBtnHtml = ""; + + for(var i in splitId){ + + sendBtnHtml += ''+splitNm[i].trim()+"
"; + + } + + $("#sendBtnArea").html(sendBtnHtml); + }); function fncCheckNextYn() { @@ -266,6 +283,10 @@ commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } + function sendDlvInfoUrlPop() { + commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop')); + } + function sendDlvInfo() { var frm = document.dlvpop; frm.action = ""; @@ -294,16 +315,76 @@ $('#addUsrNm' + assIdx).val(ass1); $('#addChgYn' + assIdx).val('Y'); } + + function sendDlvInfoRppl() { + var f = document.getElementById("dlvpop"); + + if(f.dlvrySeq.value == "") { + alert("송달URL을 만들 서류를 선택해주세요."); + return; + } + + if($("input:checkbox[name=rpplSeqs]:checked").length == 0) { + alert("송달URL을 보낼 사람을 선택해주세요."); + return; + } + + var rpplSeqs = []; + $("input:checkbox[name=rpplSeqs]:checked").each(function() { + rpplSeqs.push($(this).val()); + + }); + + f.rpplSeqs.value = rpplSeqs; + + if (confirm("송달정보를 전달하기위해 URL을 생성하시겠습니까?")) { + + var data = new FormData(f); + + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/dlvinfo/dlvinfoUrlInsertAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("송달정보 전달 URL 등록이 완료되었습니다."); + fncGoList("insert"); + } else { + alert(returnData.message); + } + + }, + error : function(e) { + alert("송달정보 전달 URL 등록에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + + } + + } + " /> + " /> + " /> " /> + + + +
" /> @@ -609,6 +690,92 @@
+ + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + + +
@@ -619,7 +786,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 2ce7b1e9..374cb8ae 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 @@ -18,6 +18,22 @@ $(document).ready(function() { fncShow(); fncCheckNextYn(); + + //송달 정보 SET + var resPonDentId = "${info.resPonDentId}"; //피신청인 rpplSeq 배열 + var resPonDentNm = "${info.resPonDentNm}"; //피신청인 rpplNm 배열 + var splitId = resPonDentId.split(','); + var splitNm = resPonDentNm.split(','); + + var sendBtnHtml = ""; + + for(var i in splitId){ + + sendBtnHtml += ''+splitNm[i].trim()+"
"; + + } + + $("#sendBtnArea").html(sendBtnHtml); }); function fncCheckNextYn() { @@ -232,6 +248,10 @@ function sendDlvInfoPop() { commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } + + function sendDlvInfoUrlPop() { + commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop')); + } function sendDlvInfo() { var frm = document.dlvpop; @@ -243,15 +263,74 @@ frm.action = ""; frm.submit(); } + + function sendDlvInfoRppl() { + var f = document.getElementById("dlvpop"); + + if(f.dlvrySeq.value == "") { + alert("송달URL을 만들 서류를 선택해주세요."); + return; + } + + if($("input:checkbox[name=rpplSeqs]:checked").length == 0) { + alert("송달URL을 보낼 사람을 선택해주세요."); + return; + } + + var rpplSeqs = []; + $("input:checkbox[name=rpplSeqs]:checked").each(function() { + rpplSeqs.push($(this).val()); + + }); + + f.rpplSeqs.value = rpplSeqs; + + if (confirm("송달정보를 전달하기위해 URL을 생성하시겠습니까?")) { + + var data = new FormData(f); + + $.ajax({ + type : "POST", + url : "/kccadr/adjPgrMgr/dlvinfo/dlvinfoUrlInsertAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("송달정보 전달 URL 등록이 완료되었습니다."); + fncGoList("insert"); + } else { + alert(returnData.message); + } + + }, + error : function(e) { + alert("송달정보 전달 URL 등록에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + + } + + } + " /> + " /> + " /> " /> + + +
" /> @@ -466,14 +545,99 @@
+ + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + + + +
- + 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 6c6ed5a2..0910d38d 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 @@ -16,7 +16,22 @@ " /> + " /> + " /> " /> + + +
" /> @@ -307,6 +385,92 @@
+ + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + + +
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 a6281a0f..43586be4 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 @@ -16,7 +16,21 @@ " /> + " /> + " /> " /> + + +
" /> @@ -382,13 +458,97 @@
+ + +

+

* 송달정보 URL로 전송하기

+

+
+ + + + + + + + + + + + + + + + + + + + + + + +
송달서류선택 + +
신청인 + +
피신청인 +
+ +
송달URL 전송하기 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름URLURL전달일시최초열람일시최종열람일시
+

+ 		+

+ 		+

+ 		+

미열람

+ 		+

미열람

+
+
+ + + +
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index 64348d0a..bb7e0e64 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -26,8 +26,13 @@ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index 3a3f39f8..6da63646 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -4,10 +4,12 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> - - + + + + @@ -45,7 +47,17 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp index 434bbcb3..911ff193 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp @@ -4,22 +4,13 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> - -
- - -
- - - - - + + \ No newline at end of file diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index 800ee2a4..7b46f5a8 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -144,6 +144,12 @@ p+.list_util{width: auto;} .btn_layout04{text-align: center;} +.btn_layout05 {position:relative;width:100%;margin:0 0 15px;} +.btn_layout05:after {content:'';display:block;clear:both;} +.btn_layout05 .btn_left_box {float:left;width:calc(100% - 100px);} +.btn_layout05 .btn_left_box .btnType02 {float:left;margin:0 5px 5px 0;} +.btn_layout05 .btn_right_box {float:right;width:100px;} + /* 버튼 타입 */ .btnType01{height: 36px; padding: 0 11px; font-size: 15px; font-weight: 400; background-color: #fffaf5; color: #ea5404; border: 1px solid #ea5404; border-radius: 5px; transition: all 0.1s linear;} .btnType01:hover{background-color: #f6e7d5; transition: all 0.1s linear;} diff --git a/src/main/webapp/kccadrPb/tutorial/css/tutorial.css b/src/main/webapp/kccadrPb/tutorial/css/tutorial.css index dfb3b8d3..de288dbb 100644 --- a/src/main/webapp/kccadrPb/tutorial/css/tutorial.css +++ b/src/main/webapp/kccadrPb/tutorial/css/tutorial.css @@ -1,6 +1,6 @@ body{position: relative; width: 100%; height: 100%;} .tutorial{width: 100%; height: 100%; overflow-x: hidden;} -.tutorial img{position: absolute;left: 50%;top: 0;transform: translateX(-50%);} +.tutorial img{position: absolute;width:100%; left: 50%;top: 0;transform: translateX(-50%);} .mask{position: fixed; display: flex; width: 100%; height: 100%; left: 0; top: 0; z-index: 5;} .left_mask,.right_mask{width: 50%; height: 100%; background-color: transparent;} @media all and (max-width: 1800px){ diff --git a/src/main/webapp/kccadrPb/tutorial/image/01.gif b/src/main/webapp/kccadrPb/tutorial/image/01.gif index ada1cf84..71de7926 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/01.gif and b/src/main/webapp/kccadrPb/tutorial/image/01.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/02.gif b/src/main/webapp/kccadrPb/tutorial/image/02.gif index 84596fa8..3bf983eb 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/02.gif and b/src/main/webapp/kccadrPb/tutorial/image/02.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/03.gif b/src/main/webapp/kccadrPb/tutorial/image/03.gif index 219092c1..9da5fecf 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/03.gif and b/src/main/webapp/kccadrPb/tutorial/image/03.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/04.gif b/src/main/webapp/kccadrPb/tutorial/image/04.gif index 35069a47..971589c3 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/04.gif and b/src/main/webapp/kccadrPb/tutorial/image/04.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/05.gif b/src/main/webapp/kccadrPb/tutorial/image/05.gif index 0fbce009..f435dcb9 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/05.gif and b/src/main/webapp/kccadrPb/tutorial/image/05.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/06.gif b/src/main/webapp/kccadrPb/tutorial/image/06.gif index 1f69622a..5c1a146f 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/06.gif and b/src/main/webapp/kccadrPb/tutorial/image/06.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/07.gif b/src/main/webapp/kccadrPb/tutorial/image/07.gif index 7463e5ce..8ec0a106 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/07.gif and b/src/main/webapp/kccadrPb/tutorial/image/07.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/08.gif b/src/main/webapp/kccadrPb/tutorial/image/08.gif index b0a71c1c..3e851b53 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/08.gif and b/src/main/webapp/kccadrPb/tutorial/image/08.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/09.gif b/src/main/webapp/kccadrPb/tutorial/image/09.gif index 501b535b..bef30602 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/09.gif and b/src/main/webapp/kccadrPb/tutorial/image/09.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/10.gif b/src/main/webapp/kccadrPb/tutorial/image/10.gif index 7b31c0ce..86b01bf6 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/10.gif and b/src/main/webapp/kccadrPb/tutorial/image/10.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/11.gif b/src/main/webapp/kccadrPb/tutorial/image/11.gif index 6307f425..e4c574c3 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/11.gif and b/src/main/webapp/kccadrPb/tutorial/image/11.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/12.gif b/src/main/webapp/kccadrPb/tutorial/image/12.gif index e8dcb1f1..779b9fbf 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/12.gif and b/src/main/webapp/kccadrPb/tutorial/image/12.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/13.gif b/src/main/webapp/kccadrPb/tutorial/image/13.gif index f61189f2..79248585 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/13.gif and b/src/main/webapp/kccadrPb/tutorial/image/13.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/14.gif b/src/main/webapp/kccadrPb/tutorial/image/14.gif index 40881a41..44b79fdf 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/14.gif and b/src/main/webapp/kccadrPb/tutorial/image/14.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/15.gif b/src/main/webapp/kccadrPb/tutorial/image/15.gif index adf62039..39aac289 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/15.gif and b/src/main/webapp/kccadrPb/tutorial/image/15.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/16.gif b/src/main/webapp/kccadrPb/tutorial/image/16.gif index be602398..efe23bba 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/16.gif and b/src/main/webapp/kccadrPb/tutorial/image/16.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/17.gif b/src/main/webapp/kccadrPb/tutorial/image/17.gif index 94bf3d22..c7f7e607 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/17.gif and b/src/main/webapp/kccadrPb/tutorial/image/17.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/18.gif b/src/main/webapp/kccadrPb/tutorial/image/18.gif index 7bd74317..dac8b61d 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/18.gif and b/src/main/webapp/kccadrPb/tutorial/image/18.gif differ diff --git a/src/main/webapp/kccadrPb/tutorial/image/19.gif b/src/main/webapp/kccadrPb/tutorial/image/19.gif index e70ad1b5..0d3d0c48 100644 Binary files a/src/main/webapp/kccadrPb/tutorial/image/19.gif and b/src/main/webapp/kccadrPb/tutorial/image/19.gif differ