diff --git a/src/main/java/kcc/com/cmm/LoginVO.java b/src/main/java/kcc/com/cmm/LoginVO.java index b3615254..fca5b341 100644 --- a/src/main/java/kcc/com/cmm/LoginVO.java +++ b/src/main/java/kcc/com/cmm/LoginVO.java @@ -124,6 +124,8 @@ public class LoginVO implements Serializable{ /*20221012 대시보드를 위해 직급 코드 추가*/ private String ofcpsNm; + private String phone; + public String getId() { return id; } @@ -429,5 +431,13 @@ public class LoginVO implements Serializable{ public void setCertNum(String certNum) { this.certNum = certNum; } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + + } diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index b8f31017..09a4e5fd 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -1,6 +1,8 @@ package kcc.kccadr.accdnt.ars.web; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -28,6 +30,8 @@ import kcc.kccadr.accdnt.ai.service.AdjstIncidentService; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; +import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjclsmgr.service.AdjClsMgrService; import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.advc.service.AdrHstryMgrService; @@ -83,6 +87,8 @@ public class AdjstReqStatusController { @Resource(name = "adjClsMgrService") private AdjClsMgrService adjClsMgrService; + @Resource(name = "ExmpAppManageService") + private ExmpAppManageService exmpAppManageService; /** * 조정진행 상태 및 관리 목록 화면 */ @@ -248,6 +254,21 @@ public class AdjstReqStatusController { model.addAttribute("reqInfo" , reqPeson); model.addAttribute("agenInfo" , agenPerson); model.addAttribute("resInfo" , resInfo); + ExmpManageVO exmpManageVO = new ExmpManageVO(); + exmpManageVO.setExmpCd("05"); + + /* + * 20221013 - 이호영 + * 도움말 select + * */ + List exmpManageListVO = exmpAppManageService.selectExmpAppManagerList(exmpManageVO); + + HashMap helpMap = (HashMap) exmpManageListVO.stream().collect( + Collectors.toMap(ExmpManageVO::getExmpCcTy, ExmpManageVO::getExmpCn)); + + model.addAttribute("helpMap" , helpMap); + + // --//도움말 select //이력값 - 시작 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 23719608..383eb683 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -646,9 +646,18 @@ public class ApmController { @RequestMapping(value = "popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - model.addAttribute("ccTy", adjstReqVO.getCcTy()); - model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + List exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); +// if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(exmp.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + model.addAttribute("exmp", exmp); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop"; } @@ -664,7 +673,7 @@ public class ApmController { @RequestMapping(value = "popup/adjstReqOpenExamplePop2.do") public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO).get(0); if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { FileVO fileVO = new FileVO(); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java index c0110ca5..09cef6c6 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java @@ -64,7 +64,7 @@ public class ExmpAnswerManagerController { exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); // 답변서 코드 - exmpManageVO.setCodeId("CC003"); + exmpManageVO.setExmpCd("04"); paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO)); model.addAttribute("paginationInfo", paginationInfo); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java index f882cf3a..6356a306 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java @@ -16,8 +16,6 @@ public interface ExmpAppManageService { List selectExmpAppDetailList(ExmpManageVO exmpManageVO) throws Exception; - Map selectExmpAnswerManagerInfo(ExmpManageVO exmpManageVO); - RestResponse insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception; void updateExmpManager(ExmpManageVO exmpManageVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java index df9fab4d..375e091e 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java @@ -36,10 +36,6 @@ public class ExmpAppManageDAO extends EgovAbstractDAO { return (List)list("ExmpAppManageDAO.selectExmpDetailList", exmpManageVO); } - public String selectOneAdjustExmpCcTy(ExmpManageVO exmpManageVO) { - return (String) select("ExmpAppManageDAO.selectOneAdjustExmpCcTy", exmpManageVO); - } - public void insertExmpAppManager(ExmpManageVO exmpManageVO) { insert("ExmpAppManageDAO.insertExmpManager", exmpManageVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java index 82ce2237..79a72a26 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java @@ -59,7 +59,7 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { } map.put("mgrInfo", mgrInfo); - map.put("list", exmpAppManageDAO.selectExmpAppDetailList(exmpManageVO)); +// map.put("list", exmpAppManageDAO.selectExmpAppDetailList(exmpManageVO)); return map; } @@ -69,40 +69,20 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { return exmpAppManageDAO.selectExmpAppDetailList(exmpManageVO); } - @Override - public Map selectExmpAnswerManagerInfo(ExmpManageVO exmpManageVO) { - - Map map = new HashMap(); - - String ccTy = exmpAppManageDAO.selectOneAdjustExmpCcTy(exmpManageVO); - - if(StringUtils.isEmpty(ccTy)) - { - ccTy = "001"; - }else { - int resutl = Integer.parseInt(ccTy)+1; - ccTy = Integer.toString(resutl); - } - - map.put("ccTy", ccTy); - - return map; - } - @Override public RestResponse insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { try { exmpManageVO.setExmpMgrId(idgenExmpMrgService.getNextStringId()); exmpAppManageDAO.insertExmpAppManager(exmpManageVO); - for(ExmpManageVO model : exmpManageVO.getExmpList()){ - model.setExmpMgrId(exmpManageVO.getExmpMgrId()); - model.setExmpDtlId(idgenExmpDtlService.getNextStringId()); - model.setFrstRegisterId(exmpManageVO.getFrstRegisterId()); - model.setLastUpdusrId(exmpManageVO.getLastUpdusrId()); - model.setExmpCcTy(exmpManageVO.getExmpCcTy()); - exmpAppManageDAO.insertExmpDetailList(model); - } +// for(ExmpManageVO model : exmpManageVO.getExmpList()){ +// model.setExmpMgrId(exmpManageVO.getExmpMgrId()); +// model.setExmpDtlId(idgenExmpDtlService.getNextStringId()); +// model.setFrstRegisterId(exmpManageVO.getFrstRegisterId()); +// model.setLastUpdusrId(exmpManageVO.getLastUpdusrId()); +// model.setExmpCcTy(exmpManageVO.getExmpCcTy()); +// exmpAppManageDAO.insertExmpDetailList(model); +// } return new RestResponse(HttpStatus.OK, "정상적으로 등록되었습니다.", LocalDateTime.now()); } catch (Exception e) { return new RestResponse(HttpStatus.BAD_REQUEST, "오류가 발생하였습니다. 관리자에게 문의해 주세요", LocalDateTime.now()); @@ -112,13 +92,13 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { @Override public void updateExmpManager(ExmpManageVO exmpManageVO) { - System.out.println(":::::::::::::::::"); + exmpAppManageDAO.updateExmpManager(exmpManageVO); - for(ExmpManageVO model : exmpManageVO.getExmpList()){ - model.setExmpMgrId(exmpManageVO.getExmpMgrId()); - model.setLastUpdusrId(exmpManageVO.getLastUpdusrId()); - exmpAppManageDAO.updateExmpAppDetails(model); - } +// for(ExmpManageVO model : exmpManageVO.getExmpList()){ +// model.setExmpMgrId(exmpManageVO.getExmpMgrId()); +// model.setLastUpdusrId(exmpManageVO.getLastUpdusrId()); +// exmpAppManageDAO.updateExmpAppDetails(model); +// } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java index 5aa6e04d..e0dba573 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java @@ -64,59 +64,59 @@ public class ExmpAppManagerController { * @author : 이호영 * @date : 2022.10.11 * @description : 예문관리 LIST - * @param exmpAppManageVO + * @param exmpManageVO * @param model * @return * @throws Exception */ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerList.do") - public String exmpAppManagerList(@ModelAttribute("exmpAppManageVO") ExmpManageVO exmpAppManageVO , ModelMap model) throws Exception { - if(exmpAppManageVO.getPageUnit() != 10) { - exmpAppManageVO.setPageUnit(exmpAppManageVO.getPageUnit()); + public String exmpAppManagerList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception { + if(exmpManageVO.getPageUnit() != 10) { + exmpManageVO.setPageUnit(exmpManageVO.getPageUnit()); } - if("".equals(exmpAppManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - exmpAppManageVO.setSearchSortCnd("T1.Exmp_CC_TY"); - exmpAppManageVO.setSearchSortOrd("asc"); + if("".equals(exmpManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + exmpManageVO.setSearchSortCnd("T1.Exmp_CC_TY"); + exmpManageVO.setSearchSortOrd("asc"); } /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(exmpAppManageVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(exmpAppManageVO.getPageUnit()); - paginationInfo.setPageSize(exmpAppManageVO.getPageSize()); + paginationInfo.setCurrentPageNo(exmpManageVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(exmpManageVO.getPageUnit()); + paginationInfo.setPageSize(exmpManageVO.getPageSize()); - exmpAppManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - exmpAppManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); - exmpAppManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); + exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - exmpAppManageVO.setCodeId("CC002"); - paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpAppManageVO)); + exmpManageVO.setExmpCd("02"); + paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO)); model.addAttribute("paginationInfo", paginationInfo); - model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpAppManageVO)); + model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpManageVO)); return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerList"; } @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerCreate.do") - public String exmpAppManagerCreate(ExmpManageVO exmpAppManageVO, ModelMap model) throws Exception { + public String exmpAppManagerCreate(ExmpManageVO exmpManageVO, ModelMap model) throws Exception { return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate"; } @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerModify.do") - public String exmpAppManagerModify(@ModelAttribute("exmpAppManageVO") ExmpManageVO exmpAppManageVO , ModelMap model) throws Exception { + public String exmpAppManagerModify(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception { - Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpAppManageVO);; + Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);; model.addAttribute("fileList", resultMap.get("fileList")); model.addAttribute("mgrInfo", resultMap.get("mgrInfo")); - model.addAttribute("list", resultMap.get("list")); +// model.addAttribute("list", resultMap.get("list")); return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify"; } @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/updateExmpManager.do") - public ModelAndView updateExmpManager(@ModelAttribute("exmpAppManageVO") ExmpManageVO exmpAppManageVO + public ModelAndView updateExmpManager(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO ,ModelMap model, final MultipartHttpServletRequest multiRequest) throws Exception { ModelAndView modelAndView = new ModelAndView(); @@ -125,36 +125,37 @@ public class ExmpAppManagerController { String uploadFolder = ""; - String atchFileId = exmpAppManageVO.getAtchFileId(); + String atchFileId = exmpManageVO.getAtchFileId(); List result = null; final Map files = multiRequest.getFileMap(); - if(!files.isEmpty() && StringUtils.isNotBlank(exmpAppManageVO.getAtchFileId())){ + if(!files.isEmpty() && StringUtils.isNotBlank(exmpManageVO.getAtchFileId())){ FileVO fvo = new FileVO(); fvo.setAtchFileId(atchFileId); int cnt = fileMngService.getMaxFileSN(fvo); result = fileUtil.parseFileInf(files, "Exmp_" , cnt, atchFileId, uploadFolder, ""); fileMngService.updateFileInfs(result); } - exmpAppManageVO.setAtchFileId(atchFileId); - exmpAppManageVO.setLastUpdusrId(loginVO.getUniqId()); + exmpManageVO.setAtchFileId(atchFileId); + exmpManageVO.setLastUpdusrId(loginVO.getUniqId()); - exmpAppManageService.updateExmpManager(exmpAppManageVO); + exmpAppManageService.updateExmpManager(exmpManageVO); modelAndView.addObject("result", KccadrConstants.SUCCESS); return modelAndView; } @RequestMapping(value = {"/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do"}, method = RequestMethod.POST) - public ResponseEntity exmpAppManagerCheck(HttpServletRequest request , @RequestBody ExmpManageVO exmpAppManageVO) throws Exception { - return ResponseEntity.ok().body(exmpAppManageService.existsExmpManagerDataCheck(exmpAppManageVO)); + public ResponseEntity exmpAppManagerCheck(HttpServletRequest request , @RequestBody ExmpManageVO exmpManageVO) throws Exception { + System.out.println("exmpManageVO.getExmpCcTy() :: "+ exmpManageVO.getExmpCcTy()); + return ResponseEntity.ok().body(exmpAppManageService.existsExmpManagerDataCheck(exmpManageVO)); } @RequestMapping(value="/kccadr/adjPgrMgr/exmp/insertExmpAppManager.do") - public ResponseEntity insertExmpAppManager(ExmpManageVO exmpAppManageVO, final MultipartHttpServletRequest multiRequest) throws Exception { + public ResponseEntity insertExmpAppManager(ExmpManageVO exmpManageVO, final MultipartHttpServletRequest multiRequest) throws Exception { LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - String atchFileId = exmpAppManageVO.getAtchFileId(); + String atchFileId = exmpManageVO.getAtchFileId(); List result = null; final Map files = multiRequest.getFileMap(); @@ -162,9 +163,9 @@ public class ExmpAppManagerController { result = fileUtil.parseFileInf(files, "Exmp_" , 0, atchFileId, "", ""); atchFileId = fileMngService.insertFileInfs(result); } - exmpAppManageVO.setAtchFileId(atchFileId); - exmpAppManageVO.setFrstRegisterId(loginVO.getUniqId()); - return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpAppManageVO)); + exmpManageVO.setAtchFileId(atchFileId); + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpManageVO)); } @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerDetail.do") @@ -174,7 +175,7 @@ public class ExmpAppManagerController { model.addAttribute("fileList", resultMap.get("fileList")); model.addAttribute("mgrInfo", resultMap.get("mgrInfo")); - model.addAttribute("list", resultMap.get("list")); +// model.addAttribute("list", resultMap.get("list")); return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java index f84f86fa..b19477c9 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java @@ -1,162 +1,131 @@ -package kcc.kccadr.adjPgrMgr.exmp.cmm; - - -import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageVO; - -import java.util.List; - -public class ExmpManageVO extends ConciliatorManageVO { - - - /** - * - */ - private static final long serialVersionUID = -4650759575042493292L; - - List exmpList; - - /* 예문 관리 PK */ - private String exmpMgrId; - - /* 예문 관리 상세 PK */ - private String exmpDtlId; - - private String expmCcTy; - - private String ccTyNm; - - private String expmTit; - - private String ccTy; - - private String exmpNms; - - private String exmpCd; - - private String exmpCn; - - private String atchFileId; - - private String exmpCcTy; - - private String exmpTit; - - private String codeId; - - - - - public String getExmpMgrId() { - return exmpMgrId; - } - - public void setExmpMgrId(String exmpMgrId) { - this.exmpMgrId = exmpMgrId; - } - - public String getExmpDtlId() { - return exmpDtlId; - } - - public void setExmpDtlId(String exmpDtlId) { - this.exmpDtlId = exmpDtlId; - } - - public String getExpmCcTy() { - return expmCcTy; - } - - public void setExpmCcTy(String expmCcTy) { - this.expmCcTy = expmCcTy; - } - - public String getCcTyNm() { - return ccTyNm; - } - - public void setCcTyNm(String ccTyNm) { - this.ccTyNm = ccTyNm; - } - - public String getExpmTit() { - return expmTit; - } - - public void setExpmTit(String expmTit) { - this.expmTit = expmTit; - } - - public String getCcTy() { - return ccTy; - } - - public void setCcTy(String ccTy) { - this.ccTy = ccTy; - } - - public String getExmpNms() { - return exmpNms; - } - - public void setExmpNms(String exmpNms) { - this.exmpNms = exmpNms; - } - - public String getExmpCd() { - return exmpCd; - } - - public void setExmpCd(String exmpCd) { - this.exmpCd = exmpCd; - } - - public String getExmpCn() { - return exmpCn; - } - - public void setExmpCn(String exmpCn) { - this.exmpCn = exmpCn; - } - - public List getExmpList() { - return exmpList; - } - - public void setExmpList(List exmpList) { - this.exmpList = exmpList; - } - - public String getAtchFileId() { - return atchFileId; - } - - public void setAtchFileId(String atchFileId) { - this.atchFileId = atchFileId; - } - - public String getExmpCcTy() { - return exmpCcTy; - } - - public void setExmpCcTy(String exmpCcTy) { - this.exmpCcTy = exmpCcTy; - } - - public String getExmpTit() { - return exmpTit; - } - - public void setExmpTit(String exmpTit) { - this.exmpTit = exmpTit; - } - - public String getCodeId() { - return codeId; - } - - public void setCodeId(String codeId) { - this.codeId = codeId; - } - - -} +package kcc.kccadr.adjPgrMgr.exmp.cmm; + + +import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageVO; + +import java.util.List; + +public class ExmpManageVO extends ConciliatorManageVO { + + + /** + * + */ + private static final long serialVersionUID = -4650759575042493292L; + + List exmpList; + + /* 예문 관리 PK */ + private String exmpMgrId; + + /* 예문 관리 상세 PK */ + private String exmpDtlId; + + private String exmpCcTy; + + private String ccTyNm; + + private String exmpTit; + + private String ccTy; + + private String exmpNms; + + private String exmpCd; + + private String exmpCn; + + private String atchFileId; + + public List getExmpList() { + return exmpList; + } + + public void setExmpList(List exmpList) { + this.exmpList = exmpList; + } + + public String getExmpMgrId() { + return exmpMgrId; + } + + public void setExmpMgrId(String exmpMgrId) { + this.exmpMgrId = exmpMgrId; + } + + public String getExmpDtlId() { + return exmpDtlId; + } + + public void setExmpDtlId(String exmpDtlId) { + this.exmpDtlId = exmpDtlId; + } + + public String getExmpCcTy() { + return exmpCcTy; + } + + public void setExmpCcTy(String exmpCcTy) { + this.exmpCcTy = exmpCcTy; + } + + public String getCcTyNm() { + return ccTyNm; + } + + public void setCcTyNm(String ccTyNm) { + this.ccTyNm = ccTyNm; + } + + public String getExmpTit() { + return exmpTit; + } + + public void setExmpTit(String exmpTit) { + this.exmpTit = exmpTit; + } + + public String getCcTy() { + return ccTy; + } + + public void setCcTy(String ccTy) { + this.ccTy = ccTy; + } + + public String getExmpNms() { + return exmpNms; + } + + public void setExmpNms(String exmpNms) { + this.exmpNms = exmpNms; + } + + public String getExmpCd() { + return exmpCd; + } + + public void setExmpCd(String exmpCd) { + this.exmpCd = exmpCd; + } + + public String getExmpCn() { + return exmpCn; + } + + public void setExmpCn(String exmpCn) { + this.exmpCn = exmpCn; + } + + public String getAtchFileId() { + return atchFileId; + } + + public void setAtchFileId(String atchFileId) { + this.atchFileId = atchFileId; + } + + + + +} diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java index bab1653c..843e6c4d 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java @@ -92,8 +92,8 @@ public class ExmpEffectManagerController { exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - // 의견 코드 - exmpManageVO.setCodeId("05"); + // 신청취지 코드 + exmpManageVO.setExmpCd("01"); paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO)); model.addAttribute("paginationInfo", paginationInfo); @@ -115,7 +115,6 @@ public class ExmpEffectManagerController { model.addAttribute("fileList", resultMap.get("fileList")); model.addAttribute("mgrInfo", resultMap.get("mgrInfo")); - model.addAttribute("list", resultMap.get("list")); return "kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify"; } @@ -126,7 +125,7 @@ public class ExmpEffectManagerController { model.addAttribute("fileList", resultMap.get("fileList")); model.addAttribute("mgrInfo", resultMap.get("mgrInfo")); - model.addAttribute("list", resultMap.get("list")); +// model.addAttribute("list", resultMap.get("list")); return "kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java index 7e889473..b64d2d0b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java @@ -92,7 +92,7 @@ public class ExmpHelpManagerController { exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); // 의견 코드 - exmpManageVO.setCodeId("05"); + exmpManageVO.setExmpCd("05"); paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO)); model.addAttribute("paginationInfo", paginationInfo); @@ -119,7 +119,7 @@ public class ExmpHelpManagerController { } @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpHelpManagerDetail.do") - public String exmpHelpManagerDetail( ExmpManageVO exmpManageVO , ModelMap model) throws Exception { + public String exmpHelpManagerDetail(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception { Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);; @@ -130,5 +130,5 @@ public class ExmpHelpManagerController { return "kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail"; } - + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java index cc511ece..8bba5297 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java @@ -77,7 +77,7 @@ public class ExmpOpinionManagerController { exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); // 의견 코드 - exmpManageVO.setCodeId("CC007"); + exmpManageVO.setExmpCd("03"); paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO)); model.addAttribute("paginationInfo", paginationInfo); diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index 2428c8ba..e855f85e 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -365,7 +365,16 @@ public class AdjstConciliatorController { model.addAttribute("info", info); return "/web/kccadr/adjcclt/adjstDrtDetail"; - } + } + + /** + * 기일조서 상세 > 자주쓰는 의견 목록 팝업 + */ + @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsPopList.do") + public String adjstOpinionsPopList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { +// model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); + return "/web/kccadr/adjcclt/popup/adjstOpinionsPopList"; + } /** * 조정사건 목록 화면 diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java index 66615c1f..0c185060 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java @@ -252,6 +252,10 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ * */ private String smsSendSeq; // SMS 발송 로그 PK + private String phone; // 수신번호 + private String userId; + private String smsSendTypeCd; // 발송유형 - CC052 + private String certNum; // 인증번호 public AdjReqMgrVO getAdrVO() { return adrVO; @@ -1193,9 +1197,30 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ public void setSmsSendSeq(String smsSendSeq) { this.smsSendSeq = smsSendSeq; } - - - + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getUserId() { + return userId; + } + public void setUserId(String userId) { + this.userId = userId; + } + public String getSmsSendTypeCd() { + return smsSendTypeCd; + } + public void setSmsSendTypeCd(String smsSendTypeCd) { + this.smsSendTypeCd = smsSendTypeCd; + } + public String getCertNum() { + return certNum; + } + public void setCertNum(String certNum) { + this.certNum = certNum; + } } diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java index 9de57583..4e0d8b79 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java @@ -53,7 +53,7 @@ public interface AdjstReqService { public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception; - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; + public List selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 43d31309..cac1a6be 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -165,6 +165,7 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { private String reqDetail; private String rejtReson; private String edtStatus; + private String exmpMgrId; private String exmpCd; private String exmpCn; private String exmpTit; @@ -881,6 +882,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { public void setLoginNextUrl(String loginNextUrl) { this.loginNextUrl = loginNextUrl; } + public String getExmpMgrId() { + return exmpMgrId; + } + public void setExmpMgrId(String exmpMgrId) { + this.exmpMgrId = exmpMgrId; + } } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java index 2b1764d3..5d876102 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java @@ -176,8 +176,8 @@ public class AdjstReqDAO extends EgovAbstractDAO { return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenAnswerExamplePop",adjstReqVO); } - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); + public List selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { + return (List) list("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); } public int selectRespondentSchChk(AdjstReqVO adjstReqVO) { diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java index 5b3b3db1..cb77f259 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java @@ -1177,7 +1177,7 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj } @Override - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { + public List selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO); } } diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 0f510eb1..260ed2b2 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -50,6 +50,7 @@ import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; +import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.KccadrConstants; @@ -203,10 +204,34 @@ public class AdjstReqWebController { */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - model.addAttribute("ccTy", adjstReqVO.getCcTy()); - model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + + List exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + +// if (exmpList != null && StringUtils.isNotBlank(exmpList.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(exmpList.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + model.addAttribute("exmpList", exmpList); + return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } + + @RequestMapping(value = {"/web/kccadr/adjst/popup/adjstReqOpenExampleAjax.do"}) + public ResponseEntity saveAdjReqRecordAjax(AdjstReqVO adjstReqVO, HttpServletRequest request) throws Exception { + + List exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + +// if (exmpList != null && StringUtils.isNotBlank(exmpList.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(exmpList.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, exmpList, "", LocalDateTime.now())); + } /** @@ -220,7 +245,7 @@ public class AdjstReqWebController { @RequestMapping(value = "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.do") public String adjstReqOpenExamplePop2(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO).get(0); if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { FileVO fileVO = new FileVO(); @@ -228,42 +253,46 @@ public class AdjstReqWebController { List fileList = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", fileList); } - System.out.println("exmp :: "+ exmp); model.addAttribute("exmp", exmp); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop2"; } @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do") public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { - System.out.println("adjstReqVO.getExmpCd() :: "+ adjstReqVO.getExmpCd()); - System.out.println("adjstReqVO.getExmpCcTy() :: "+ adjstReqVO.getExmpCcTy()); - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); -// if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { +// if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { // FileVO fileVO = new FileVO(); -// fileVO.setAtchFileId(expm.getAtchFileId()); +// fileVO.setAtchFileId(exmp.getAtchFileId()); // List fileList = fileService.selectFileInfs(fileVO); // model.addAttribute("fileList", fileList); // } - return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, expm.getExmpCn(), LocalDateTime.now())); + return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, exmp.getExmpCn(), LocalDateTime.now())); } - /** - * 조정신청 구분선택 - 안내화면 + /** + * @methodName : adjstReqOpenAnswerExamplePop + * @author : 이호영 + * @date : 2022.10.14 + * @description : 답변서 예문 + * @param adjstReqVO + * @param model + * @return + * @throws Exception */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do") public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenAnswerExamplePop(adjstReqVO); - if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenAnswerExamplePop(adjstReqVO); + if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(expm.getAtchFileId()); + fileVO.setAtchFileId(exmp.getAtchFileId()); List fileList = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", fileList); } - model.addAttribute("expm", expm); + model.addAttribute("exmp", exmp); return "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop"; } - + /** * 조정신청 구분선택 - 안내화면 diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index d902024d..dd4d7f57 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -398,17 +398,15 @@ public class AdjstExpController { */ @RequestMapping("/web/kccadr/adjstExp/popup/adjstReqOpenExamplePopCn.do") public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { - System.out.println("adjstReqVO.getExmpCd() :: "+ adjstReqVO.getExmpCd()); - System.out.println("adjstReqVO.getExmpCcTy() :: "+ adjstReqVO.getExmpCcTy()); - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); + AdjstReqVO exmp = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); -// if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { +// if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { // FileVO fileVO = new FileVO(); -// fileVO.setAtchFileId(expm.getAtchFileId()); +// fileVO.setAtchFileId(exmp.getAtchFileId()); // List fileList = fileService.selectFileInfs(fileVO); // model.addAttribute("fileList", fileList); // } - return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, expm.getExmpCn(), LocalDateTime.now())); + return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, exmp.getExmpCn(), LocalDateTime.now())); } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 481c237a..43b35a2c 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -6,7 +6,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -19,6 +18,7 @@ import kcc.com.cmm.util.StringUtil; import kcc.kccadr.accdnt.acd.service.AdjstChangeDateVO; import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; +import kcc.kccadr.accdnt.apm.service.AdjstPayMentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; @@ -170,16 +170,16 @@ public class AdjstExpDetailController { * 조정신청 구분선택 - 안내화면 */ @RequestMapping("/web/kccadr/adjstExpDetail/popup/adjstPayMentDetailPopup.do") - public String adjstPayMentDetailPopup(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { + public String adjstPayMentDetailPopup(@ModelAttribute("adjstPayMentVO") AdjstPayMentVO adjstPayMentVO, ModelMap model) throws Exception { - return null; + return "/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup"; } /** * 조정신청 구분선택 - 안내화면 */ @RequestMapping("/web/kccadr/adjstExpDetail/popup/openExpExamplePop.do") - public String adjstReqOpenAnswerExamplePop(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { + public String openExpExamplePop(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { String returnUrl = "/web/kccadr/adjstExpDetail/"; diff --git a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java index e4af18df..12beb784 100644 --- a/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java +++ b/src/main/java/kcc/kccadr/cmm/service/SMSOracleService.java @@ -41,4 +41,6 @@ public interface SMSOracleService { // SMS OTP 인증번호 발송(저작위 SMS서버 DB등록) public String insertSmsOtpCertNumSend(AdjReqMgrVO adjReqMgrVO) throws Exception; + + public String selectAdrOtpCertNumSmsLog(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 cd29c9cc..8659e1e4 100644 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java @@ -13,6 +13,7 @@ import java.net.URLEncoder; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Random; import javax.annotation.Resource; @@ -705,15 +706,16 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM int bytes = adjReqMgrVO.getSendMsg().getBytes("euc-kr").length; // 발송메시지 바이트수 if (bytes > 90) { - sMSOracleDAO.insertMmsCustomSend(adjReqMgrVO); // SMS 등록 장문 > SMS DB(오라클) +// sMSOracleDAO.insertMmsCustomSend(adjReqMgrVO); // SMS 등록 장문 > SMS DB(오라클) adjReqMgrDAO.insertAdrMmsCustomSend(adjReqMgrVO); // SMS 이력 등록 장문 > 전자조정 } else { - sMSOracleDAO.insertSmsCustomSend(adjReqMgrVO); // SMS 등록 단문 > SMS DB(오라클) +// sMSOracleDAO.insertSmsCustomSend(adjReqMgrVO); // SMS 등록 단문 > SMS DB(오라클) adjReqMgrDAO.insertAdrSmsCustomSend(adjReqMgrVO); // SMS 이력 등록 단문 > 전자조정 } //sms 발송 관리 테이블에 저장 adjReqMgrVO.setRpplNm(""); + // SMS 발송 로그 pk idgen String smsSendSeq = idgenService.getNextStringId(); adjReqMgrVO.setSmsSendSeq(smsSendSeq); @@ -728,8 +730,11 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM LOGGER.debug("SMS 전송DB 등록 결과:[" + result +"]"); return result; } - - - + + @Override + public String selectAdrOtpCertNumSmsLog(AdjReqMgrVO adjReqMgrVO) throws Exception{ + + return msgMgrDAO.selectAdrOtpCertNumSmsLog(adjReqMgrVO); + } } diff --git a/src/main/java/kcc/kccadr/kccadrCom/web/OtpCertUtil.java b/src/main/java/kcc/kccadr/kccadrCom/web/OtpCertUtil.java new file mode 100644 index 00000000..dea8f9a8 --- /dev/null +++ b/src/main/java/kcc/kccadr/kccadrCom/web/OtpCertUtil.java @@ -0,0 +1,76 @@ +package kcc.kccadr.kccadrCom.web; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Component; + +import kcc.com.cmm.LoginVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; +import kcc.kccadr.cmm.service.SMSOracleService; + +@Component("OtpCertUtil") +public class OtpCertUtil { + + @Resource(name = "SMSOracleService") + private SMSOracleService sMSOracleService; + + /** + * @Method Name : otpCert + * @작성일 : 2022. 10. 12. + * @작성자 : 이준호 + * @Method 설명 : OTP 문자인증 시 인증번호 검증 + */ + public String otpCert(LoginVO loginVO_P, LoginVO loginVO_R) throws Exception{ + try { + + /* + * select 조건 + * loginVO_P - certNum + * loginVO_P - phone + * loginVO_R - uniqId + * smsSendTypeCd = '001' (OTP인증번호 발송) + * limit 1 + * + * */ + + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + + adjReqMgrVO.setCertNum(loginVO_P.getCertNum()); + adjReqMgrVO.setPhone(loginVO_P.getPhone()); + adjReqMgrVO.setFrstRegisterId(loginVO_R.getUniqId()); + + String frstRegistPnttm = ""; + frstRegistPnttm = sMSOracleService.selectAdrOtpCertNumSmsLog(adjReqMgrVO); + + if ("".equals(frstRegistPnttm) || frstRegistPnttm == null) { + return "empty"; + } else { + // 시간 비교 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date nowdate = new Date(); + Date compareDate = format.parse(frstRegistPnttm); + + Calendar cal = Calendar.getInstance(); + cal.setTime(nowdate); + // 5분 추가 + cal.add(Calendar.MINUTE, +5); + + nowdate = cal.getTime(); + + // 인증번호을 발송한지 5분 이내일때 + if (compareDate.before(nowdate)) { + return "success"; + } else { + return "timeOut"; + } + } + + } catch (Exception e) { + return "exception"; + } + } +} \ No newline at end of file diff --git a/src/main/java/kcc/kccadr/kccadrCom/web/otpCertUtil.java b/src/main/java/kcc/kccadr/kccadrCom/web/otpCertUtil.java deleted file mode 100644 index 69296376..00000000 --- a/src/main/java/kcc/kccadr/kccadrCom/web/otpCertUtil.java +++ /dev/null @@ -1,67 +0,0 @@ -package kcc.kccadr.kccadrCom.web; - -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -import kcc.let.uss.umt.service.UserManageVO; - -public class otpCertUtil { - - /** - * @Method Name : mjonSmsCertCheck - * @작성일 : 2022. 8. 25. - * @작성자 : 이준호 - * @Method 설명 : 미허용 IP 관리자 페이지 로그인 시 SMS인증번호 체크 - */ - public String otpCertUtil(String phone, String certNum, String mberId) throws Exception{ -// try { - - UserManageVO userManageVO = new UserManageVO(); - - // userManageVO set - userManageVO.setCertNum(certNum); - userManageVO.setMoblphonNo(phone); - userManageVO.setEmplyrId(mberId); - -// // SendLogVO set -// SendLogVO sendLogVO = new SendLogVO(); -// sendLogVO.setReceive(userManageVO.getMoblphonNo()); -// -// // 인증번호 가져오기 -// sendLogVO = mjonMsgDataService.selectSysMsgLog(sendLogVO); -// if (sendLogVO == null) { -// return "empty"; -// } else { -// // 시간 비교 -// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// Date nowdate = new Date(); -// Date compareDate = format.parse(sendLogVO.getFrstSendPnttm()); -// -// Calendar cal = Calendar.getInstance(); -// cal.setTime(compareDate); -// // 5분 추가 -// cal.add(Calendar.MINUTE, +5); -// -// compareDate = cal.getTime(); -// -// // 인증번호을 발송한지 5분 이내일때 -// if (compareDate.after(nowdate)) { -// UserManageVO checkUser = userManageService.selectAdminUserSmsCertCheck(userManageVO); -// -// if (checkUser != null) { -// return "success"; -// } else { -// return "checkNoFail"; -// } -// } else { -// return "timeOut"; -// } -// } - -// } catch (Exception e) { - return "exception"; -// } -// } - } -} diff --git a/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java b/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java index 68f5daa2..224c3f10 100644 --- a/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java +++ b/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java @@ -79,4 +79,10 @@ public class MsgMgrDAO extends EgovAbstractDAO { insert("MsgMgrDAO.insertAdrOtpCertNumSmsLog", adjReqMgrVO); } + + public String selectAdrOtpCertNumSmsLog(AdjReqMgrVO adjReqMgrVO) throws Exception{ + + return (String) select("MsgMgrDAO.selectAdrOtpCertNumSmsLog", adjReqMgrVO); + } + } diff --git a/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java b/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java index 8c464425..ddc0caa8 100644 --- a/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java +++ b/src/main/java/kcc/let/uat/uia/service/EgovLoginService.java @@ -88,4 +88,6 @@ public interface EgovLoginService { void updatePassMissReset(LoginVO loginVO) throws Exception; void updateEmplyrSttusCode(LoginVO loginVO) throws Exception; + + String selectUniqueId(String str) throws Exception; } diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java index 1409f77a..6fc064f7 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovLoginServiceImpl.java @@ -275,5 +275,10 @@ public class EgovLoginServiceImpl extends EgovAbstractServiceImpl implements loginDAO.updateEmplyrSttusCode(loginVO); } + @Override + public String selectUniqueId(String str) throws Exception{ + return loginDAO.selectUniqueId(str); + } + } diff --git a/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java b/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java index d3014b93..9c4c161d 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/LoginDAO.java @@ -133,4 +133,8 @@ public class LoginDAO extends EgovAbstractDAO { return (String)select("loginDAO.selectLoginType", str); } + public String selectUniqueId(String str) throws Exception{ + return (String)select("loginDAO.selectUniqueId", str); + } + } diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 59280c2b..ef23dfdc 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Random; import javax.annotation.Resource; import javax.script.ScriptEngineManager; @@ -67,6 +68,7 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.cmm.util.WebUtil; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.cmm.service.SMSOracleService; +import kcc.kccadr.kccadrCom.web.OtpCertUtil; import kcc.let.sym.log.clg.service.EgovLoginLogService; import kcc.let.sym.log.clg.service.LoginLog; import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; @@ -175,6 +177,9 @@ public class EgovLoginController { @Resource(name = "SMSOracleService") private SMSOracleService sMSOracleService; + + @Resource(name = "OtpCertUtil") + private OtpCertUtil otpCertUtil; /* @@ -202,6 +207,7 @@ public class EgovLoginController { Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); if (isAuthenticated) return "redirect:/cmm/main/mainPage.do"; + // initRsa(request); //로그인 페이지 접근시 IP체크 제거_로그인 버튼 클릭 시 로그인 유형에 따라 체크로 변경_221011_이준호 @@ -546,84 +552,56 @@ public class EgovLoginController { LoginVO resultVO = loginService.actionLogin(loginVO); /* - * 미허용 IP 인증번호 비교 flag + * OTP 인증번호 비교 flag * false : 인증번호 비교 결과 맞음 * true : 인증번호 비교 결과 틀림 * */ Boolean otpCertFlag = false; -// if(StringUtil.isNotEmpty(loginVO.getCertNum()) && "002".equals(resultVO.getLoginTypeCd())) { -// -// //수신자 -// String callTo = resultVO.getMoblphonNo(); -// String checkNo = loginVO.getCheckNo(); -// String mberId = resultVO.getId(); -// -// /* -// * 인증번호 비교 -// * return -// * empty = "인증번호 발송 내역이 없습니다. 최고관리자에게 문의하세요." -// * success = "5분이내 발송 내역 비교, 인증번호 비교 시 일치" -// * smsCertFlag = true -// * checkNoFail = "인증번호를 확인해 주세요" -// * timeOut = "인증번호 시간이 초과되었습니다. \\n 인증번호를 다시 발송합니다." -// * Exception = "에러가 발생하였습니다. 다시 시도해 주세요. \\n 에러가 지속될 시 최고관리자에게 문의하세요."; -// * final = "exception"; -// * -// * 실패 시 passMiss 숫자++ update -// * loginService.updatePassMissPlus(loginVO); -// * -// * */ -// String result = otpCertUtil.otpCertUtil(callTo, checkNo, mberId); -// -// if(result.equals("empty")) { -// loginService.updatePassMissPlus(loginVO); -// model.addAttribute("message", "인증번호 발송 내역이 없습니다. 최고관리자에게 문의하세요."); -// initRsa(request); -// return "uat/uia/EgovLoginUsr"; -// } else if(result.equals("success")) { -// smsCertFlag = true; -// } else if(result.equals("checkNoFail")) { -// loginService.updatePassMissPlus(loginVO); -// model.addAttribute("message", "인증번호를 확인해 주세요"); -// model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n등록 된 휴대폰 번호로 발송된 인증번호를 입력해주세요."); -// model.addAttribute("mode", "본인인증"); -// model.addAttribute("id", resultVO.getId()); -// model.addAttribute("password", authSelfPw); -// -// //인증문자 발송 -// mjonSmsCertSendUtil.mjonSmsCertSend(callTo); -// -// initRsa(request); -// return "uat/uia/EgovLoginUsr"; -// } else if(result.equals("timeOut")) { -// model.addAttribute("message", "인증번호 시간이 초과되었습니다. \\n 인증번호를 다시 발송합니다."); -// model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n등록 된 휴대폰 번호로 발송된 인증번호를 입력해주세요."); -// model.addAttribute("mode", "본인인증"); -// model.addAttribute("id", resultVO.getId()); -// model.addAttribute("password", authSelfPw); -// -// //인증문자 발송 -// mjonSmsCertSendUtil.mjonSmsCertSend(callTo); -// -// initRsa(request); -// return "uat/uia/EgovLoginUsr"; -// } else if(result.equals("Exception")) { -// model.addAttribute("message", "에러가 발생하였습니다. 다시 시도해 주세요. \\\\n 에러가 지속될 시 최고관리자에게 문의하세요."); -// model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n등록 된 휴대폰 번호로 발송된 인증번호를 입력해주세요."); -// model.addAttribute("mode", "본인인증"); -// model.addAttribute("id", resultVO.getId()); -// model.addAttribute("password", authSelfPw); -// -// //인증문자 발송 -// mjonSmsCertSendUtil.mjonSmsCertSend(callTo); -// -// initRsa(request); -// return "uat/uia/EgovLoginUsr"; -// } -// } -// + if(StringUtil.isNotEmpty(loginVO.getCertNum()) && "002".equals(resultVO.getLoginTypeCd())) { + + /* + * 인증번호 비교 + * return + * empty = "인증번호 발송 내역이 없습니다. 최고관리자에게 문의하세요." + * success = "5분이내 발송 내역 비교, 인증번호 비교 시 일치" + * smsCertFlag = true + * timeOut = "인증번호 시간이 초과되었습니다. \\n 인증번호를 다시 발송합니다." + * Exception = "에러가 발생하였습니다. 다시 시도해 주세요. \\n 에러가 지속될 시 최고관리자에게 문의하세요."; + * final = "exception"; + * + * 실패 시 passMiss 숫자++ update + * loginService.updatePassMissPlus(loginVO); + * + * */ + String result = otpCertUtil.otpCert(loginVO, resultVO); + + if(result.equals("empty")) { + loginService.updatePassMissPlus(loginVO); + model.addAttribute("message", "인증번호가 일치하지 않습니다. \\n 다시 시도해주세요."); + return "uat/uia/EgovLoginUsr"; + } else if(result.equals("success")) { + otpCertFlag = true; + } else if(result.equals("timeOut")) { + model.addAttribute("message", "인증번호 시간이 초과되었습니다."); + model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n 인증번호 받기를 다시 시도해주세요."); + model.addAttribute("mode", "OTP"); + model.addAttribute("id", resultVO.getId()); + model.addAttribute("password", authSelfPw); + + return "uat/uia/EgovLoginUsr"; + } else if(result.equals("Exception")) { + model.addAttribute("message", "에러가 발생하였습니다. 다시 시도해 주세요. \\\\n 에러가 지속될 시 최고관리자에게 문의하세요."); + model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n 인증번호 받기를 다시 시도해주세요."); + model.addAttribute("mode", "OTP"); + model.addAttribute("id", resultVO.getId()); + model.addAttribute("password", authSelfPw); + + return "uat/uia/EgovLoginUsr"; + } + } + if (loginService.getUserAuth(resultVO) != null) { resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority()); } @@ -648,13 +626,6 @@ public class EgovLoginController { HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); String userIp = EgovClntInfo.getClntIP(req); -// String userIp = req.getHeader("X-FORWARDED-FOR"); -// if (userIp == null) { -// userIp = req.getRemoteAddr(); -// } - - // 개발중 IP 유형 테스트 -// userIp = "123.456.789.000"; /* * 관리자 로그인 유형 추가_221011 @@ -693,7 +664,7 @@ public class EgovLoginController { } // OTP 로그인 - else if("002".equals(resultVO.getLoginTypeCd()) && StringUtil.isEmpty(resultVO.getCertNum())){ + else if("002".equals(resultVO.getLoginTypeCd()) && StringUtil.isEmpty(loginVO.getCertNum()) && !otpCertFlag){ model.addAttribute("mode","OTP"); @@ -2293,11 +2264,57 @@ public class EgovLoginController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); + try { + String userId = adjReqMgrVO.getUserId(); + + //userId -> esntlId 조회후 frstregistId에 set + adjReqMgrVO.setFrstRegisterId(loginService.selectUniqueId(userId)); + + // data set + adjReqMgrVO = otpDataSet(adjReqMgrVO); + + sMSOracleService.insertSmsOtpCertNumSend(adjReqMgrVO); + + modelAndView.addObject("result", "SUCCESS"); + + } catch (Exception e) { + System.out.println("otpCertSmsAjax Exception!!!!!!!!"); + modelAndView.addObject("message", "인증번호 발송에 실패하였습니다."); + } - - + return modelAndView; } + + /** + * (관리자) OTP인증 인증번호 발송 Ajax data set 함수 + * + * @return AdjReqMgrVO + */ + private AdjReqMgrVO otpDataSet(AdjReqMgrVO adjReqMgrVO) { + + // 인증번호 난수 생성 + String contents = "전자조정시스템 OTP 인증 로그인 인증번호 문자입니다. 인증번호는 : %code% 입니다."; + String code = ""; + long seed = System.currentTimeMillis(); + Random random = new Random(seed); + StringBuffer randomCode = new StringBuffer(); + for (int i = 0; i < 6; i++) { + code = randomCode.append(Integer.toString(random.nextInt(10))).toString(); + } + contents = contents.replace("%code%", code); + + // 문자내용 set + adjReqMgrVO.setSendMsg(contents); + + // 인증번호 set + adjReqMgrVO.setCertNum(code); + + // 문자 발송 로그 + adjReqMgrVO.setSmsSendTypeCd("001"); + + return adjReqMgrVO; + } } diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 3023cd59..1fa17550 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1278,7 +1278,7 @@ public class MainController { if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ menuUrl = "/web/cop/org/selectOrgList.do" ; }else if(menuUrl.equals("/web/kccadr/accdnt/ars/adjstReqStatusDetail.do") - || menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") +// || menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") || menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateList.do") || menuUrl.equals("/web/kccadr/accdnt/acd/adjstChangeDateCreate.do") || menuUrl.equals("/web/kccadr/accdnt/arc/corReqList.do") @@ -1320,7 +1320,21 @@ public class MainController { }else if(menuUrl.equals("/web/kccadr/accdnt/ai/adjstIncidentDashList.do")) { //나의사건관리 대시보드 menuUrl = "/web/kccadr/accdnt/ai/adjstIncidentList.do"; - } + }else if(menuUrl.equals("/web/kccadr/adjstExpDetail/adjstReqStatusDetail.do") // 체험하기 + ||menuUrl.equals("/web/kccadr/adjstExp/adjstIncidentList.do") + ||menuUrl.equals("/web/kccadr/adjstExpDetail/adjstIncidentDetail.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistInformation.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep1.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep2.do") + ||menuUrl.equals("/web/kccadr/adjstExp/adjstReqRegistStep3.do") + ||menuUrl.equals("/web/kccadr/adjstExp/SsoLoginUsr.do") + ||menuUrl.equals("") + ||menuUrl.equals("") + ||menuUrl.equals("") + ||menuUrl.equals("") + ) { //체험하기 + menuUrl = "/web/kccadr/adjstExp/adjstExpMainPage.do"; + } @@ -1343,7 +1357,7 @@ public class MainController { } }else { //조직도 상세 String menuUrl = request.getRequestURI() ; - if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ + if(menuUrl.equals("/web/cop/org/selectOrgDetail.do")){ menuUrl = "/web/cop/org/selectOrgList.do" ; ComDefaultVO searchVO = new ComDefaultVO(); searchVO.setSearchKeyword(menuUrl); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml index 6ae15902..8dffd474 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml @@ -8,7 +8,7 @@ SELECT COUNT(1) AS TOT FROM ADR_EXMP_MGR T1 - WHERE CODE_ID = #codeId# + WHERE T1.EXMP_CD = #exmpCd# ( T1.EXMP_TIT LIKE CONCAT('%' , #searchKeyword#, '%') OR @@ -25,42 +25,18 @@ SELECT EXMP_MGR_ID AS exmpMgrId + , EXMP_CD AS exmpCd , EXMP_CC_TY AS exmpCcTy , EXMP_TIT AS exmpTit + , EXMP_CN AS exmpCn , ATCH_FILE_ID AS atchFileId , FRST_REGIST_PNTTM AS frstRegistPnttm , FRST_REGISTER_ID AS frstRegisterId , LAST_UPDT_PNTTM AS lastUpdtPnttm , LAST_UPDUSR_ID AS lastUpdusrId - , CODE_ID AS codeId FROM ADR_EXMP_MGR WHERE EXMP_MGR_ID = #exmpMgrId# @@ -179,18 +160,10 @@ EXMP_MGR_ID FROM ADR_EXMP_MGR WHERE EXMP_CC_TY = #exmpCcTy# - AND CODE_ID = #codeId# + AND EXMP_CD = #exmpCd# ) - - SELECT - T1.EXMP_TIT AS exmpTit + T1.EXMP_MGR_ID AS exmpMgrId + ,T1.EXMP_TIT AS exmpTit ,T1.ATCH_FILE_ID AS atchFileId ,T1.EXMP_CC_TY AS exmpCcTy - ,T2.EXMP_CD AS exmpCd - ,T2.EXMP_CN AS exmpCn + ,T1.EXMP_CD AS exmpCd + ,T1.EXMP_CN AS exmpCn FROM ADR_EXMP_MGR T1 - INNER JOIN ADR_EXMP_DTL T2 - ON T1.EXMP_CC_TY = T2.EXMP_CC_TY WHERE 1=1 - AND T1.EXMP_CC_TY = #ccTy# - AND T2.EXMP_CD = #exmpCd# + + AND T1.EXMP_CC_TY = #ccTy# + + AND T1.EXMP_CD = #exmpCd# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml index 339850e4..ec9698ef 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml @@ -225,12 +225,41 @@ - - - - + INSERT + INTO adr_sms_send_mgr + ( + sms_send_seq, + sms_send_type_cd, + phone, + call_from, + cn, + cert_num, + frst_regist_pnttm, + frst_register_id + ) + VALUES + ( + #smsSendSeq#, + #smsSendTypeCd#, + #trPhone#, + #sendTelNo#, + #sendMsg#, + #certNum#, + now(), + #frstRegisterId# + ) + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml index e2278758..6871981e 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml @@ -408,4 +408,12 @@ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate.jsp index 470bcccb..309bf08a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate.jsp @@ -36,64 +36,7 @@ $(document).ready( function() { }); }); -function fncRowAdd(){ - // 등록가능한 갯수 - var len = $("select[name*=exmpCd]:first option").length; - var rowLen = $(".addTb > table > tbody > tr").length; - var obj = $(".addTb > table > tbody > tr:last"); - - var cloneObj = obj.clone(true); - console.log('cloneObj : ',cloneObj); - if(len == 0 || rowLen >= (len-1)){ - alert("등록가능한 항목은 갯수는 " + (len-1) + "개 입니다."); - return false; - } - var exmpCd = cloneObj.find("select[name*=exmpCd]"); - var exmpCn = cloneObj.find("textarea[name*=exmpCn]"); - exmpCd.val(""); - exmpCn.val(""); - exmpCd.attr("name", exmpCd.attr("name").replace(/[0-9]/gi, rowLen)); - exmpCn.attr("name", exmpCn.attr("name").replace(/[0-9]/gi, rowLen)); - obj.after(cloneObj); -} - -function fncRowDel(){ - var rowLen = $(".addTb > table > tbody > tr").length; - if(rowLen == 1){ - alert("더이상 삭제할 수 없습니다."); - return false; - } - $(".addTb > table > tbody > tr:last").remove(); -} - -// function fncSave(){ -// var exmpCcTy = ""; -// if(exmpCcTy != ''){ -// saveProcess(); -// }else{ -// $.ajax({ -// type: "POST", -// url: "/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do", -// data: JSON.stringify({exmpCcTy : 0 -// ,codeId : $('#codeId').val()}), -// dataType:'json', -// async: false, -// processData: false, -// contentType: "application/json", -// cache: false, -// success: function (data) { -// if(data.status == "OK"){ -// saveProcess(); -// }else{ -// alert(data.message); -// return false; -// } -// }, -// error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } -// }); -// } -// } - + function saveProcess(){ if(!validation()){ return false; @@ -115,7 +58,7 @@ function saveProcess(){ success:function(returnData){ if(returnData.status == "OK"){ alert(returnData.data); - fncDetail(); + fncGoList(); }else{ alert(returnData.data); } @@ -140,38 +83,21 @@ function validation(){ return flag = false; } + var cn = $('#exmpCn').val(); - var validArr = []; - $.each(obj , function(idx, elm){ - var cn = $(this).find("textarea[name*=exmpCn]").val(); - - var textLen = conByteLeng(cn); //예문 입력 내용 Byte 계산 처리 - + if(cn == ''){ + alert("예문내용을 입력해주세요."); + return flag = false; + } + var textLen = conByteLeng(cn); - if(cn == ''){ - alert("예문내용을 입력해주세요.["+(idx+1)+"]"); - return flag = false; - } + if(Number(textLen) > 2000){ - if(Number(textLen) > 2000){ - - alert("예문 내용의 길이는 2000자를 넘을 수 없습니다."); - return flag = false; - - } + alert("예문 내용의 길이는 2000자를 넘을 수 없습니다."); + return flag = false; - }); - var checkObj = validArr.reduce((accu, curr) => { - accu[curr] = (accu[curr] || 0)+1; - return accu; - }, {}); - - $.each(checkObj, function(key, value){ - if(parseInt(value) > 1){ - alert("동일한 항목을 중복으로 등록하실 수 없습니다."); - return flag = false; - } - }); + } + return flag; } @@ -180,13 +106,6 @@ function fncGoList(){ varFrom.action = ""; varFrom.submit(); } - -function fncDetail(){ - var varFrom = document.getElementById("createForm"); - varFrom.action = ""; - varFrom.submit(); -} - - + - - - -"/> + + + +"/> - +" />
-

신청서예문수정

+

신청원인예문관리 수정

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문수정
    • +
  • 신청원인예문관리 수정
@@ -322,36 +321,25 @@
-

항목추가

-
- - -
+

- - - - - - - - - + + + +
항목 예문내용
- - - -
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp index e7b9fd80..8530d3c3 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp @@ -36,65 +36,9 @@ }); }); - function fncRowAdd(){ - // 등록가능한 갯수 - var len = $("select[name*=exmpCd]:first option").length; - var rowLen = $(".addTb > table > tbody > tr").length; - var obj = $(".addTb > table > tbody > tr:last"); - - var cloneObj = obj.clone(true); - console.log('cloneObj : ',cloneObj); - if(len == 0 || rowLen >= (len-1)){ - alert("등록가능한 항목은 갯수는 " + (len-1) + "개 입니다."); - return false; - } - var exmpCd = cloneObj.find("select[name*=exmpCd]"); - var exmpCn = cloneObj.find("textarea[name*=exmpCn]"); - exmpCd.val(""); - exmpCn.val(""); - exmpCd.attr("name", exmpCd.attr("name").replace(/[0-9]/gi, rowLen)); - exmpCn.attr("name", exmpCn.attr("name").replace(/[0-9]/gi, rowLen)); - obj.after(cloneObj); - } - function fncRowDel(){ - var rowLen = $(".addTb > table > tbody > tr").length; - if(rowLen == 1){ - alert("더이상 삭제할 수 없습니다."); - return false; - } - $(".addTb > table > tbody > tr:last").remove(); - } function fncSave(){ - var exmpCcTy = ""; - if(exmpCcTy != ''){ - saveProcess(); - }else{ - $.ajax({ - type: "POST", - url: "/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do", - data: JSON.stringify({exmpCcTy : $("#exmpCcTy").val() - ,codeId : $('#codeId').val()}), - dataType:'json', - async: false, - processData: false, - contentType: "application/json", - cache: false, - success: function (returnData) { - if(returnData.status == "OK"){ - saveProcess(); - }else{ - alert(returnData.data); - return false; - } - }, - error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } - }); - } - } - - function saveProcess(){ if(!validation()){ return false; } @@ -115,7 +59,7 @@ success:function(returnData){ if(returnData.status == "OK"){ alert(returnData.data); - fncDetail(); + fncGoList(); }else{ alert(returnData.data); } @@ -140,60 +84,27 @@ return flag = false; } - if($("#exmpCcTy").val() == ''){ - alert("저작물을 선택해주세요."); + var cn = $('#exmpCn').val(); + + if(cn == ''){ + alert("예문내용을 입력해주세요."); return flag = false; } + var textLen = conByteLeng(cn); - var validArr = []; - $.each(obj , function(idx, elm){ - var cd = $(this).find("select[name*=exmpCd]").val(); - var cn = $(this).find("textarea[name*=exmpCn]").val(); - validArr[idx] = cd; + if(Number(textLen) > 2000){ - var textLen = conByteLeng(cn); //예문 입력 내용 Byte 계산 처리 + alert("예문 내용의 길이는 2000자를 넘을 수 없습니다."); + return flag = false; - if(cd == ''){ - alert("항목을 선택해주세요.["+(idx+1)+"]"); - return flag = false; - } - - if(cn == ''){ - alert("예문내용을 입력해주세요.["+(idx+1)+"]"); - return flag = false; - } - - if(Number(textLen) > 2000){ - - alert("예문 내용의 길이는 2000자를 넘을 수 없습니다."); - return flag = false; - - } - - }); - var checkObj = validArr.reduce((accu, curr) => { - accu[curr] = (accu[curr] || 0)+1; - return accu; - }, {}); - - $.each(checkObj, function(key, value){ - if(parseInt(value) > 1){ - alert("동일한 항목을 중복으로 등록하실 수 없습니다."); - return flag = false; - } - }); + } + return flag; } function fncGoList(){ var varFrom = document.getElementById("createForm"); - varFrom.action = ""; - varFrom.submit(); - } - - function fncDetail(){ - var varFrom = document.getElementById("createForm"); - varFrom.action = ""; + varFrom.action = ""; varFrom.submit(); } @@ -208,24 +119,23 @@ - " /> + " />
-

신청서예문등록

+

신청취지예문관리 등록

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문등록
    • +
  • 신청취지예문관리 등록
-

예문 저작물종류

+

기본 정보

@@ -241,11 +151,6 @@ - - @@ -304,31 +209,22 @@
-

항목추가

-
- - -
+

신청취지

저작물종류 - -<%-- --%> -
첨부파일
- - - diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp index 407ccd97..65fa7427 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp @@ -36,13 +36,13 @@ function fncGoList(){ var varFrom = document.getElementById("detailForm"); varFrom.exmpCcTy.value = ''; - varFrom.action = ""; + varFrom.action = ""; varFrom.submit(); } function fncEdit(){ var varFrom = document.getElementById("detailForm"); - varFrom.action = ""; + varFrom.action = ""; varFrom.submit(); } @@ -53,25 +53,24 @@ -" /> +" /> " />
-

신청서예문상세

+

신청취지예문관리 상세

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문상세
    • +
  • 신청취지예문관리 상세
-

예문 저작물종류

+

기본정보

항목 예문내용
- - - +
@@ -87,10 +86,6 @@ - - @@ -110,49 +105,25 @@
-

항목추가

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

저작물종류 - -
- +<%-- --%> - - - - - - - - - - - - - - - - - + + +
항목 예문내용
- - - -
- - - -
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp index 7bd51dfd..63a0f68d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp @@ -10,20 +10,20 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %> <% - /** - * @Class Name : AdjustDeptManagerList.jsp - * @Description : 조정부관리 - * @Modification Information - * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.08.09 김봉호 최초 생성 - * @author 김봉호 - * @since 2021.08.21 - * @version 1.0 - * @see - * - */ +/** + * @Class Name : exmpOpinionManagerList.jsp + * @Description : 신청취지 예문 관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.10.12 이호영 최초 생성 + * @author 이호영 + * @since 2021.10.12 + * @version 1.0 + * @see + * + */ %> @@ -39,13 +39,13 @@ listForm.pageIndex.value = pageNo ; listForm.searchCondition.value = $('#searchCondition').val(); listForm.searchKeyword.value = $('#searchKeyword').val(); - listForm.action = ""; + listForm.action = ""; listForm.submit(); } function fncCreate() { var listForm = document.listForm ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -69,7 +69,7 @@ function fncDetailPage(exmpMgrId){ var listForm = document.listForm ; listForm.exmpMgrId.value = exmpMgrId; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -78,10 +78,10 @@ - - " /> - " /> - " /> + + " /> + " /> + " /> @@ -90,13 +90,13 @@
-

신청취지예문관리

+

신청취지예문관리 목록

  • 조정진행관리

    • -
  • 신청취지예문관리
    • +
  • 신청취지예문관리 목록
@@ -107,11 +107,11 @@

총 건수 : 건

- +
@@ -120,18 +120,14 @@
- - - - @@ -139,29 +135,23 @@ - - - +
번호저작물 제목항목 등록일
- - + + - - + + - - - -
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp index 12edb050..44e6e62c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp @@ -36,60 +36,7 @@ }); }); - function fncRowAdd(){ - // 등록가능한 갯수 - var len = $("select[name*=exmpCd]:first option").length; - var rowLen = $(".addTb > table > tbody > tr").length; - var obj = $(".addTb > table > tbody > tr:last"); - var cloneObj = obj.clone(true); - if(len == 0 || rowLen >= (len-1)){ - alert("등록가능한 항목은 갯수는 " + (len-1) + "개 입니다."); - return false; - } - var exmpCd = cloneObj.find("select[name*=exmpCd]"); - var exmpCn = cloneObj.find("textarea[name*=exmpCn]"); - exmpCd.val(""); - exmpCn.val(""); - exmpCd.attr("name", exmpCd.attr("name").replace(/[0-9]/gi, rowLen)); - exmpCn.attr("name", exmpCn.attr("name").replace(/[0-9]/gi, rowLen)); - obj.after(cloneObj); - } - function fncRowDel(){ - var rowLen = $(".addTb > table > tbody > tr").length; - if(rowLen == 1){ - alert("더이상 삭제할 수 없습니다."); - return false; - } - $(".addTb > table > tbody > tr:last").remove(); - } - - function fn_modifyBtn(){ - var exmpCcTy = ""; - if(exmpCcTy != ''){ - saveProcess(); - }else{ - $.ajax({ - type: "POST", - url: "/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do", - data: JSON.stringify({exmpCcTy : $("#exmpCcTy").val()}), - dataType:'json', - async: false, - processData: false, - contentType: "application/json", - cache: false, - success: function (returnData) { - if(data.status == "OK"){ - saveProcess(); - }else{ - alert(returnData.data); - return false; - } - }, - error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } - }); - } - } function fn_modifyBtn(){ if(!validation()){ @@ -111,7 +58,7 @@ cache: false, success:function(returnData){ if(returnData.result == "SUCCESS"){ - alert("정상적으로 등록되었습니다."); + alert("정상적으로 수정되었습니다."); fncDetail(); } }, @@ -147,12 +94,12 @@ var textLen = conByteLeng(cn); //예문 입력 내용 Byte 계산 처리 if(cd == ''){ - alert("항목을 선택해주세요.["+(idx+1)+"]"); + alert("항목을 선택해주세요."); return flag = false; } if(cn == ''){ - alert("예문내용을 입력해주세요.["+(idx+1)+"]"); + alert("예문내용을 입력해주세요."); return flag = false; } @@ -180,13 +127,13 @@ function fncGoList(){ var varFrom = document.getElementById("modifyForm"); - varFrom.action = ""; + varFrom.action = ""; varFrom.submit(); } function fncDetail(){ var varFrom = document.getElementById("modifyForm"); - varFrom.action = ""; + varFrom.action = ""; varFrom.submit(); } @@ -196,27 +143,26 @@ - + - - - -"/> + + + +"/> - +" />
-

신청서예문수정

+

신청취지예문관리 수정

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문수정
    • +
  • 신청취지예문관리 수정
@@ -322,36 +268,25 @@
-

항목추가

-
- - -
+

- - - - - - - - - + + + +
항목 예문내용
- - - -
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate.jsp index 34ff5b8d..c13a6a5a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate.jsp @@ -26,7 +26,7 @@ %> -의견예문등록 +진행단계도움말관리 + + + + + +" /> +" /> + +
+
+

자주쓰는 의견 목록

+
+
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
자주쓰는 의견 목록 : 유형, 내용, 선택등의 정보제공
유형내용선택
기일조서피신청인이 제1항 의무를 성실히 이행할 경우 어쩌고저쩌고
+ + +<%-- --%> + + +
+ +
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.jsp index f447b529..7d64068d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.jsp @@ -41,9 +41,9 @@ $(document).ready(function(){

조정신청 예문

- +
- * + *
@@ -55,8 +55,8 @@ $(document).ready(function(){ @@ -188,6 +175,78 @@ + + + +
+
+

수수료 납부 금액

+
+
+
+
+
    +
  • 체험하기 시스템 입니다.
    • +
+
+
+
- - + + 등록된 내용이 없습니다. diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index e93c6343..99353c9e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -16,28 +16,47 @@
-
-

조정신청 예문

+

신청취지 예문

- * + *
@@ -102,14 +92,13 @@ $(document).ready(function(){ @@ -118,7 +107,7 @@ $(document).ready(function(){ 내용 @@ -129,5 +118,8 @@ $(document).ready(function(){ + + " /> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp index 8bd45989..48b59763 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp @@ -61,7 +61,6 @@ * B :진행 * C :종결 */ - alert(type); var listForm = document.listForm ; listForm.action = ""; if(type == undefined) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp index 17d47bc3..8b29c5f5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp @@ -90,9 +90,12 @@ $("*[data-focus='fee_popup_close']").attr("data-focus","fee_"+mlt+"_popup_close"); } - }); + @@ -106,6 +109,13 @@

수수료 납부 금액

+
+
+
    +
  • 체험하기 시스템 입니다.
    • +
+
+
- + -<%-- --%> - + + +
- 1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다 +
@@ -119,18 +129,14 @@ - - -
수수료 납부 금액 : 신청내용, 금액등 정보제공
* - + 조정신청 체험 -

원

- +

원
@@ -145,39 +151,20 @@
계좌정보

- - - 우리은행 1005-802-193838 예금주 : 한국저작권위원회 - - -<%-- --%> - 가상계좌 :
- 예금주 : 한국저작권위원회
- - - 입금은행
- 구매자명 " />
- 메일 " /> - - - + 입금은행
+ 구매자명
+ 메일 +

- " /> - " /> + +
결제금액 -

원 -<%-- --%> - - - - (납부기간 : 까지) - -

+

원
+ + + + + + + + + + + + + + + + + +
수수료 납부 금액 : 신청내용, 금액등 정보제공
신청내용금액
* + 조정신청 체험 + +

원

+
+ + + + + + + + + + + + + + + + + + +
계좌정보, 결제금액 등 정보제공
계좌정보 +

+ 가상계좌 : 기업은행 07501740597725
+ 예금주 : 한국저작권위원회
+

+ + +
결제금액 +

원(납부기간 : 2022-12-31 23:59까지)

+
+ +
+ +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp index 65fab3cf..ee9b4fb2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp @@ -48,6 +48,69 @@ var popForm = document.popForm; commonPopWindowopenForm("/web/kccadr/adjstExpDetail/popup/adjstIncidentDetailPop.do", "840", "800", "adrRpplDetailPop", $('#popForm')); } + + function fncPayDtlPopup(type , seq, id){ + var data = { + adrSeq : '111' + }; + if(type == "M"){ + data = {mltApprSeq : seq}; + } + funOpenLayerPop("/web/kccadr/adjstExpDetail/popup/adjstPayMentDetailPopup.do" , data, 'fee_'+seq+'_popup') + + } + + function funOpenLayerPop(url, param, target){ + $('#layerPop').load( + url + , param + , function(res, status, xhr){ + if(status == "success"){ + + if(target == "fee_info_popup"){ + }else{ + var listForm = document.popCreateForm2; + var adr = listForm.adrSeq.value; + var mlt = listForm.mltApprSeq.value; + if(typeof mlt == "undefined" || mlt == ""){ + $(".fee_popup").attr("class","popup_wrap fee_"+adr+"_popup"); + $("*[data-focus='fee_popup']").attr("data-focus","fee_"+adr+"_popup"); + $("*[data-tooltip-con='fee_popup']").attr("data-tooltip-con","fee_"+adr+"_popup"); + $("*[data-focus-prev='fee_popup_close']").attr("data-focus-prev","fee_"+adr+"_popup_close"); + $("*[data-focus-next='fee_popup']").attr("data-focus-next","fee_"+adr+"_popup"); + $("*[data-focus='fee_popup_close']").attr("data-focus","fee_"+adr+"_popup_close"); + }else{ + $(".fee_popup").attr("class","popup_wrap fee_"+mlt+"_popup"); + $("*[data-focus='fee_popup']").attr("data-focus","fee_"+mlt+"_popup"); + $("*[data-tooltip-con='fee_popup']").attr("data-tooltip-con","fee_"+mlt+"_popup"); + $("*[data-focus-prev='fee_popup_close']").attr("data-focus-prev","fee_"+mlt+"_popup_close"); + $("*[data-focus-next='fee_popup']").attr("data-focus-next","fee_"+mlt+"_popup"); + $("*[data-focus='fee_popup_close']").attr("data-focus","fee_"+mlt+"_popup_close"); + } + } + + + var showTarget = $('[data-tooltip-con="' + target + '"]'); + showTarget.show().focus(); + + var popWid = showTarget.width(); + var popHei = showTarget.height(); + + var nLeft = (($(window).width() - popWid)/2); + var nTop = (($(window).height() - popHei)/2); + + showTarget.css({ + "left": nLeft, + "top": nTop + }); + showTarget.find('.tooltip-close').data('activeTarget', target); + + $(".mask").show(); + } + }); + } + + @@ -108,7 +171,7 @@

신청인

-

홀길동

+

홍길동

대리인

@@ -192,7 +255,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp index f447b529..7d64068d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqOpenAnswerExamplePop.jsp @@ -41,9 +41,9 @@ $(document).ready(function(){

조정신청 예문

- +
- * + *
@@ -55,8 +55,8 @@ $(document).ready(function(){
- - + + 등록된 내용이 없습니다. diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 39b9b3e7..6aa91599 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1223,9 +1223,34 @@ var AdjstReq = { , "adjstHostoryPop" ); }, + opinionsAdjstPopList : function(paramObj){ + if(paramObj == undefined || paramObj == ''){ + paramObj = { + pageIndex : 1, + searchKeyword : "", + searchCondition : "", + pageUnit : 5 + }; + } + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/adjcclt/popup/adjstOpinionsPopList.do" + , 500 + , 600 + , paramObj + , "N" + , "adjstOpinionsPop" + ); + }, openExamplePop : function(exmpCd){ + /* + - 01 : 신청취지 + - 02 : 신청원인 + - 04 : 답변서 + - 05 : 사건진행도움말 + */ var uri = ''; - if(exmpCd == '01') + if(exmpCd == '01' || exmpCd == '04') { uri = "adjstReqOpenExamplePop.do"; } @@ -1254,16 +1279,16 @@ var AdjstReq = { , "openExpExamplePop" ); }, - openAnswerExamplePop : function(codeId){ - commonPopLayeropen( - "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do" - , 1100 - , 600 - , {codeId : codeId} - , "N" - , "openExamplePop" - ); - }, +// openAnswerExamplePop : function(exmpCd){ +// commonPopLayeropen( +// "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop.do" +// , 1100 +// , 600 +// , {exmpCd : exmpCd} +// , "N" +// , "openExamplePop" +// ); +// }, adjstReqDataChoice : function(adrSeq){ $("#copyAdrSeq").val(adrSeq); this.fncGoRefresh(); diff --git a/src/main/webapp/js/page/adjstReq/adjstReq.js b/src/main/webapp/js/page/adjstReq/adjstReq.js index a3feb2ca..d26d6132 100644 --- a/src/main/webapp/js/page/adjstReq/adjstReq.js +++ b/src/main/webapp/js/page/adjstReq/adjstReq.js @@ -1025,6 +1025,7 @@ var AdjstReq = { ); }, openExamplePop : function(expmCd){ + console.log(" + expmCd :: ", expmCd); commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" , 1100 diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index dee55cd3..a64c3e61 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -242,6 +242,7 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .tb_list01 tbody .td_tit a{color: #222; font-weight: 400;} .tb_list01 tbody .td_date p{overflow: visible; text-overflow: unset; white-space: normal;} .tb_list01 tbody .hover_content_box {left:-10px;top:50px;} +.tb_list01 tbody .td_tit02 {font-weight:400;color:#222;text-align:left;} .tb_list01 .td_status p,.tb_list01 .td_status a,.tb_list01 .td_status button{display: inline-block; width: auto; padding: 4.5px 10px; box-sizing: border-box; border-radius: 20px; border: 1px solid #ccc; background-color: #fff; line-height: 1.2; font-size: 16px} .tb_list01 .td_status .status_write{border: 1px solid #1b6fcd; color: #1b6fcd;} @@ -303,6 +304,13 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .tbType01 td .check_wrap input[type="checkbox"],.tbType01 td .radio_wrap input[type="radio"]{vertical-align: middle;} .tbType01 td input:read-only,.tbType01 td input:disabled,.tbType01 td button:disabled,.tbType01 td select:disabled{background-color: #eee !important; color: #aaa !important; font-size: 16px;} +.tbType01 tbody .opinion .text {line-height:20px;text-align:right;} +.tbType01 tbody .opinion .text input {width:20px;height:20px;margin:0;} +.tbType01 tbody .opinion .text input + label {line-height:24px;vertical-align:top;} +.tbType01 tbody .opinion .box {overflow:hidden;margin:10px 0 0;} +.tbType01 tbody .opinion .box textarea {float:left;width:calc(100% - 100px);} +.tbType01 tbody .opinion .box .btnType09 {width:90px;height:120px;} + .tbType02{border-top: 1px solid #000; width: 100%; text-align: center; margin-bottom: 20px; table-layout: fixed;} .tbType02 thead tr{background-color: #f3f3f3; border-bottom: 0.01em solid #d5d5d5;} .tbType02 thead th{font-size: 16px; height: 55px; color: #222; vertical-align: middle;}