From 84178c28f60a84ae68229e8f822cfca71eab40ed Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 12 Oct 2022 17:10:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=EC=8B=A0=EC=B2=AD=EC=9B=90?= =?UTF-8?q?=EC=9D=B8=EC=98=88=EB=AC=B8=EA=B4=80=EB=A6=AC=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExmpAppManageServiceImpl.java | 14 ++--- .../app/web/ExmpAppManagerController.java | 6 +- .../adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml | 50 +++++---------- .../exmp/app/exmpAppManagerCreate.jsp | 62 +++++++------------ .../exmp/app/exmpAppManagerDetail.jsp | 38 +++--------- .../adjPgrMgr/exmp/app/exmpAppManagerList.jsp | 7 +-- .../exmp/app/exmpAppManagerModify.jsp | 33 ++++------ 7 files changed, 70 insertions(+), 140 deletions(-) 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..c1965dc1 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; } @@ -112,13 +112,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..086eae9e 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 @@ -90,7 +90,7 @@ public class ExmpAppManagerController { exmpAppManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); exmpAppManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - exmpAppManageVO.setCodeId("CC002"); + exmpAppManageVO.setCodeId("02"); paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpAppManageVO)); model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpAppManageVO)); @@ -111,7 +111,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/exmpAppManagerModify"; } @@ -174,7 +174,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/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..c81b5ba5 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 @@ -25,41 +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 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 e7b9fd80..f2fcdf49 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 @@ -26,7 +26,7 @@ %> -예문관리 +신청원인예문관리 - + - - - -"/> + + + +"/> - +" />
-

신청서예문수정

+

신청원인예문관리 수정

  • 조정진행관리

    • -

  • 신청서예문관리

    • -
  • 신청서예문수정
    • +
  • 신청원인예문관리 수정
@@ -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 @@ %> -의견예문등록 +진행단계도움말관리