From e9570ab3d43933081f800c249f73ff09e20de713 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 13 Oct 2022 09:56:09 +0900 Subject: [PATCH] =?UTF-8?q?feat:[=EC=98=88=EB=AC=B8-=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90-=EA=B8=B0=EB=8A=A5]=20=EC=8B=A0=EC=B2=AD=EC=9B=90?= =?UTF-8?q?=EC=9D=B8=20/=20=EC=B7=A8=EC=A7=80=20/=20=EB=8B=B5=EB=B3=80?= =?UTF-8?q?=EC=84=9C=20/=20=EC=9D=98=EA=B2=AC=20/=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EB=8B=A8=EA=B3=84=EB=8F=84=EC=9B=80=EB=A7=90=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ExmpAnswerManagerController.java | 2 +- .../app/service/ExmpAppManageService.java | 2 - .../app/service/impl/ExmpAppManageDAO.java | 4 - .../impl/ExmpAppManageServiceImpl.java | 36 +-- .../app/web/ExmpAppManagerController.java | 64 ++-- .../adjPgrMgr/exmp/cmm/ExmpManageVO.java | 293 ++++++++---------- .../web/ExmpEffectManagerController.java | 7 +- .../help/web/ExmpHelpManagerController.java | 6 +- .../web/ExmpOpinionManagerController.java | 2 +- .../adjst/web/AdjstReqWebController.java | 16 +- .../adjstExp/web/AdjstExpController.java | 10 +- .../adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml | 22 +- .../exmp/answer/exmpAnswerManagerCreate.jsp | 165 ++-------- .../exmp/answer/exmpAnswerManagerDetail.jsp | 20 +- .../exmp/answer/exmpAnswerManagerList.jsp | 6 +- .../exmp/answer/exmpAnswerManagerModify.jsp | 24 +- .../exmp/app/exmpAppManagerCreate.jsp | 39 +-- .../exmp/app/exmpAppManagerDetail.jsp | 7 +- .../adjPgrMgr/exmp/app/exmpAppManagerList.jsp | 58 ++-- .../exmp/app/exmpAppManagerModify.jsp | 23 +- .../exmp/effect/exmpEffectManagerCreate.jsp | 140 ++------- .../exmp/effect/exmpEffectManagerDetail.jsp | 55 +--- .../exmp/effect/exmpEffectManagerList.jsp | 74 ++--- .../exmp/effect/exmpEffectManagerModify.jsp | 105 ++----- .../exmp/help/exmpHelpManagerCreate.jsp | 216 +++++-------- .../exmp/help/exmpHelpManagerDetail.jsp | 28 +- .../exmp/help/exmpHelpManagerList.jsp | 30 +- .../exmp/help/exmpHelpManagerModify.jsp | 58 +--- .../exmp/opinion/exmpOpinionManagerCreate.jsp | 145 ++------- .../exmp/opinion/exmpOpinionManagerDetail.jsp | 24 +- .../exmp/opinion/exmpOpinionManagerList.jsp | 30 +- .../exmp/opinion/exmpOpinionManagerModify.jsp | 54 +--- .../popup/adjstReqOpenAnswerExamplePop.jsp | 8 +- .../web/kccadr/adjstExp/adjstIncidentList.jsp | 1 - .../adjstReqOpenAnswerExamplePop.jsp | 8 +- 35 files changed, 547 insertions(+), 1235 deletions(-) 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 c1965dc1..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 @@ -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()); 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 086eae9e..b310b7bc 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,50 +64,50 @@ 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("02"); - 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")); @@ -116,7 +116,7 @@ public class ExmpAppManagerController { } @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,36 @@ 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 { + 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 +162,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") 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/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 0f510eb1..4254cea4 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -237,15 +237,15 @@ public class AdjstReqWebController { 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())); } /** @@ -253,14 +253,14 @@ public class AdjstReqWebController { */ @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/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml index c81b5ba5..b8fe0b34 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 @@ -35,9 +35,8 @@ , T1.FRST_REGISTER_ID AS frstRegisterId , TO_CHAR(T1.LAST_UPDT_PNTTM, 'YYYY-MM-DD') AS lastUpdtPnttm , T1.LAST_UPDUSR_ID AS lastUpdusrId - , T1.CODE_ID AS codeId FROM ADR_EXMP_MGR T1 - WHERE T1.CODE_ID = #codeId# + WHERE T1.EXMP_CD = #exmpCd# ( T1.EXMP_TIT LIKE CONCAT('%' , #searchKeyword#, '%') OR @@ -90,20 +89,22 @@ INSERT INTO ADR_EXMP_MGR ( EXMP_MGR_ID + , EXMP_CD , EXMP_CC_TY , EXMP_TIT + , EXMP_CN , ATCH_FILE_ID , FRST_REGIST_PNTTM , FRST_REGISTER_ID - , CODE_ID ) VALUES ( #exmpMgrId# + , #exmpCd# , #exmpCcTy# , #exmpTit# + , #exmpCn# , #atchFileId# , NOW() , #frstRegisterId# - , #codeId# ) @@ -143,7 +144,6 @@ , 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# @@ -159,18 +159,10 @@ EXMP_MGR_ID FROM ADR_EXMP_MGR WHERE EXMP_CC_TY = #exmpCcTy# - AND CODE_ID = #codeId# + AND EXMP_CD = #exmpCd# ) - - -" /> +" /> @@ -209,18 +128,17 @@ function fncDetail(){
-

답변서예문등록

+

답변서예문관리 등록

  • 조정진행관리

    • -

  • 답변서예문관리

    • -
  • 답변서예문등록
    • +
  • 답변서예문관리 등록
-

답변서

+

기본 정보

@@ -236,18 +154,6 @@ function fncDetail(){ - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - @@ -324,49 +230,24 @@ function fncDetail(){
-

예문내용

- - - - +

답변서

첨부파일
-<%-- --%> - - - - - -<%-- --%> - - - - - - - - -<%-- --%> - - - - - - + + +
예문내용
- -
- -
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp index daedd479..c78dd351 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp @@ -53,19 +53,18 @@ -" /> +" /> " />
-

답변서예문상세

+

답변서예문관리 상세

  • 조정진행관리

    • -

  • 답변서예문관리

    • -
  • 답변서예문상세
    • +
  • 답변서예문관리 상세
@@ -115,6 +114,7 @@
+<%-- --%> @@ -123,13 +123,11 @@ - - - - - + + +
- -
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList.jsp index 3aa6f18c..452689de 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList.jsp @@ -81,7 +81,7 @@ " /> " /> - " /> + " />
@@ -89,13 +89,13 @@
-

답변서예문관리

+

답변서예문관리 목록

  • 조정진행관리

    • -
  • 답변서예문관리
    • +
  • 답변서예문관리 목록
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify.jsp index 98751c8d..68152ed5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify.jsp @@ -147,12 +147,12 @@ var textLen = conByteLeng(cn); //예문 입력 내용 Byte 계산 처리 if(cd == ''){ - alert("항목을 선택해주세요.["+(idx+1)+"]"); + alert("항목을 선택해주세요."); return flag = false; } if(cn == ''){ - alert("예문내용을 입력해주세요.["+(idx+1)+"]"); + alert("예문내용을 입력해주세요."); return flag = false; } @@ -204,19 +204,18 @@ "/> - +" />
-

답변서예문수정

+

답변서예문관리 수정

  • 조정진행관리

    • -

  • 답변서예문관리

    • -
  • 답변서예문수정
    • +
  • 답변서예문관리 수정
@@ -328,14 +327,11 @@ - - - - - - - - + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp index f2fcdf49..6382b08b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp @@ -36,36 +36,6 @@ }); }); - 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(){ $.ajax({ type: "POST", @@ -203,18 +173,17 @@ - " /> + " />
-

신청원인예문관리

+

신청원인예문관리 등록

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문등록
    • +
  • 신청원인예문관리 등록
@@ -314,7 +283,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp index 3bfb99bc..3846db17 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp @@ -53,19 +53,18 @@ -" /> +" /> " />
-

신청서예문상세

+

신청원인예문관리 상세

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문상세
    • +
  • 신청원인예문관리 상세
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp index 6cb9a62e..4992515f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.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 + * + */ %> @@ -78,11 +78,11 @@ - - " /> - " /> - " /> - + + " /> + " /> + " /> +
@@ -90,13 +90,13 @@
-

신청원인예문관리

+

신청원인예문관리 목록

  • 조정진행관리

    • -
  • 신청원인예문관리
    • +
  • 신청원인예문관리 목록
@@ -107,11 +107,11 @@

총 건수 : 건

- +
@@ -137,11 +137,11 @@ - - + + - - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify.jsp index 46342c65..e53d2043 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify.jsp @@ -196,27 +196,26 @@ - + - - - -"/> + + + +"/> - +" />
-

신청서예문수정

+

신청원인예문관리 수정

  • 조정진행관리

    • -

  • 신청서예문관리

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

항목추가

- - - - +

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..b1de3ba7 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 @@ %> -의견예문등록 +진행단계도움말관리