From df1044a3cd8dbf349ecec63a19ba0baa4d06d53a Mon Sep 17 00:00:00 2001 From: HappyITN Date: Wed, 12 Oct 2022 15:22:36 +0900 Subject: [PATCH 01/16] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC=20=EB=A0=88?= =?UTF-8?q?=EB=93=9C=EB=A7=88=EC=9D=B8=20#2812=20=EC=88=98=EC=88=98?= =?UTF-8?q?=EB=A3=8C=20=EB=82=A9=EB=B6=80=20=EA=B8=88=EC=95=A1=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp | 10 ++++++++++ 1 file changed, 10 insertions(+) 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..efd3b760 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 @@ -93,6 +93,9 @@ }); + @@ -106,6 +109,13 @@

수수료 납부 금액

+
+
+
    +
  • 체험하기 시스템 입니다.
    • +
+
+
From 84178c28f60a84ae68229e8f822cfca71eab40ed Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 12 Oct 2022 17:10:59 +0900 Subject: [PATCH 02/16] =?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 @@ %> -의견예문등록 +진행단계도움말관리 @@ -129,18 +129,14 @@ - - * - + 조정신청 체험 -

원

- +

원

- @@ -155,39 +151,20 @@ 계좌정보

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

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

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

+

원

@@ -198,6 +175,78 @@
+ + + +
+
+

수수료 납부 금액

+
+
+
+
+
    +
  • 체험하기 시스템 입니다.
    • +
+
+
+ + + + + + + + + + + + + + + + + + +
수수료 납부 금액 : 신청내용, 금액등 정보제공
신청내용금액
* + 조정신청 체험 + +

원

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

+ 가상계좌 : 기업은행 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 @@
- +
From 216685ecbdd31be4512c716ef41c23ab3d6704a6 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 13 Oct 2022 15:41:18 +0900 Subject: [PATCH 10/16] =?UTF-8?q?feat:[=EB=8C=80=EA=B5=AD=EB=AF=BC]=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=82=AC=ED=95=AD=20=EB=8F=84=EC=9B=80?= =?UTF-8?q?=EB=A7=90=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ars/web/AdjstReqStatusController.java | 21 ++++ .../app/web/ExmpAppManagerController.java | 1 + .../adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml | 1 + .../exmp/help/exmpHelpManagerCreate.jsp | 84 +++++++-------- .../exmp/help/exmpHelpManagerDetail.jsp | 15 ++- .../exmp/help/exmpHelpManagerModify.jsp | 100 ++++++------------ .../ars/tab/adjstReqStatusTabDetail.jsp | 10 +- 7 files changed, 102 insertions(+), 130 deletions(-) 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/exmp/app/web/ExmpAppManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java index b310b7bc..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 @@ -146,6 +146,7 @@ public class ExmpAppManagerController { @RequestMapping(value = {"/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do"}, method = RequestMethod.POST) public ResponseEntity exmpAppManagerCheck(HttpServletRequest request , @RequestBody ExmpManageVO exmpManageVO) throws Exception { + System.out.println("exmpManageVO.getExmpCcTy() :: "+ exmpManageVO.getExmpCcTy()); return ResponseEntity.ok().body(exmpAppManageService.existsExmpManagerDataCheck(exmpManageVO)); } 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 b8fe0b34..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 @@ -65,6 +65,7 @@ SET EXMP_TIT = #exmpTit# , EXMP_CN = #exmpCn# + , EXMP_CC_TY = #exmpCcTy# , ATCH_FILE_ID = #atchFileId# , LAST_UPDT_PNTTM = NOW() , LAST_UPDUSR_ID = #lastUpdusrId# 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 b1de3ba7..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 @@ -37,35 +37,36 @@ $(document).ready( function() { }); -function dataChk(data){ - var flag = false; - $.ajax({ - type:"POST", - url: "/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do", - data: data, - dataType:'json', - async: false, - processData: false, - contentType: false, - cache: false, - success:function(returnData){ - console.log(returnData); - flag = true; - }, - error:function(request , status, error){ - console.log('request : ', request); - console.log('status : ', status); - console.log('error : ', error); - } - }); - - return flag; -} - -function saveProcess(){ +function fncSave(){ if(!validation()){ return false; } + + console.log($("#exmpCcTy option:selected").val()); + console.log($("#exmpCcTy").val() == ''); + $.ajax({ + type: "POST", + url: "/kccadr/adjPgrMgr/exmp/existsExmpManagerDataCheck.do", + data: JSON.stringify({exmpCcTy : $("#exmpCcTy").val() + ,exmpCd : $('#exmpCd').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(confirm("해당내용을 저장 하시겠습니까?")){ @@ -74,10 +75,6 @@ function saveProcess(){ if (obj) data.append("file"+idx, obj.fileObj); }); - console.log('dataChk() : ', dataChk(data)); - - - /* $.ajax({ type:"POST", url: "/kccadr/adjPgrMgr/exmp/insertExmpAppManager.do", @@ -89,7 +86,8 @@ function saveProcess(){ cache: false, success:function(returnData){ alert(returnData.data); - if(data.status == "OK"){ + console.log(returnData); + if(returnData.status == "OK"){ fncGoList(); } }, @@ -98,7 +96,7 @@ function saveProcess(){ console.log('status : ', status); console.log('error : ', error); } - }); */ + }); } } @@ -113,10 +111,10 @@ function validation(){ return flag = false; } -// if($("#exmpCcTy").val() == ''){ -// alert("적용할 진행상태를 선택해주세요."); -// return flag = false; -// } + if($("#exmpCcTy").val() == ''){ + alert("적용할 진행상태를 선택해주세요."); + return flag = false; + } var cn = $('#exmpCn').val(); @@ -156,8 +154,7 @@ function fncGoList(){ -" /> - +" /> @@ -194,14 +191,7 @@ function fncGoList(){ 적용할 진행상태 - + @@ -309,7 +299,7 @@ function fncGoList(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail.jsp index 72b550a9..c4af2373 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail.jsp @@ -76,7 +76,7 @@ - + @@ -86,6 +86,10 @@ + 진행상태 + + + @@ -105,21 +109,16 @@
-

의견

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

도움말

-<%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify.jsp index 7d659800..b5c76028 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify.jsp @@ -36,36 +36,8 @@ }); }); - 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(){ + function fncSave(){ if(!validation()){ return false; } @@ -86,7 +58,7 @@ success:function(returnData){ console.log('returnData : ', returnData); if(returnData.result == "SUCCESS"){ - alert("정상적으로 등록되었습니다."); + alert("정상적으로 수정되었습니다."); fncDetail(); } }, @@ -100,51 +72,34 @@ function validation(){ - var obj = $(".addTb > table > tbody > tr"); var flag = true; if($("#exmpTit").val() == ''){ alert("제목을 입력해주세요."); + $("#exmpTit").focus(); return flag = false; } - 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; - - var textLen = conByteLeng(cn); //예문 입력 내용 Byte 계산 처리 - - if(cd == ''){ - alert("항목을 선택해주세요.["+(idx+1)+"]"); - return flag = false; - } + if($("#exmpCcTy").val() == ''){ + alert("적용할 진행상태를 선택해주세요."); + 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; - }, {}); + var cn = $('#exmpCn').val(); - $.each(checkObj, function(key, value){ - if(parseInt(value) > 1){ - alert("동일한 항목을 중복으로 등록하실 수 없습니다."); - return flag = false; - } - }); + if(cn == ''){ + alert("예문내용을 입력해주세요."); + return flag = false; + } + var textLen = conByteLeng(cn); + + if(Number(textLen) > 2000){ + + alert("예문 내용의 길이는 2000자를 넘을 수 없습니다."); + return flag = false; + + } + return flag; } @@ -174,7 +129,7 @@ "/> -" /> +" />
@@ -197,7 +152,7 @@
- + @@ -207,6 +162,11 @@ + + @@ -299,7 +259,7 @@ @@ -310,7 +270,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp index 4cfe4fa8..ca8cba41 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp @@ -255,7 +255,7 @@ resInfo--%>

다음
- 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
hover_content_wrap"> @@ -266,7 +266,7 @@ resInfo--%>

다음
- 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
hover_content_wrap"> @@ -277,7 +277,7 @@ resInfo--%>

다음
- 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
hover_content_wrap"> @@ -288,7 +288,7 @@ resInfo--%>

다음
- 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
hover_content_wrap"> @@ -298,7 +298,7 @@ resInfo--%> 종료

- 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
From df4fb637206a64df18dd37b7b9cae84da0508ba1 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 13 Oct 2022 16:04:25 +0900 Subject: [PATCH 11/16] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20OTP=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=20=EA=B0=9C=EB=B0=9C=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/adjreqmgr/service/AdjReqMgrVO.java | 2 +- .../kccadr/cmm/service/SMSOracleService.java | 2 + .../service/impl/SMSOracleServiceImpl.java | 9 ++- .../kcc/kccadr/kccadrCom/web/OtpCertUtil.java | 67 ++++++++++--------- .../kccadr/msg/service/impl/MsgMgrDAO.java | 6 ++ .../let/uat/uia/web/EgovLoginController.java | 63 ++++++++--------- .../sqlmap/kccadr/msg/Msg_SQL_Mysql.xml | 55 ++++++++------- .../WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp | 39 ++++++----- 8 files changed, 131 insertions(+), 112 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java index 9e28ff18..0c185060 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java @@ -255,7 +255,7 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ private String phone; // 수신번호 private String userId; private String smsSendTypeCd; // 발송유형 - CC052 - private String certNum; + private String certNum; // 인증번호 public AdjReqMgrVO getAdrVO() { return adrVO; 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 bb188a00..8659e1e4 100644 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java @@ -730,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 index 1ab12ffb..dea8f9a8 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/web/OtpCertUtil.java +++ b/src/main/java/kcc/kccadr/kccadrCom/web/OtpCertUtil.java @@ -1,12 +1,22 @@ 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 @@ -32,41 +42,32 @@ public class OtpCertUtil { adjReqMgrVO.setCertNum(loginVO_P.getCertNum()); adjReqMgrVO.setPhone(loginVO_P.getPhone()); adjReqMgrVO.setFrstRegisterId(loginVO_R.getUniqId()); - adjReqMgrVO.setSmsSendTypeCd("001"); + String frstRegistPnttm = ""; + frstRegistPnttm = sMSOracleService.selectAdrOtpCertNumSmsLog(adjReqMgrVO); - -// // 인증번호 가져오기 -// 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"; -// } -// } - return ""; + 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"; 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/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 35af180d..89a09573 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -207,6 +207,7 @@ public class EgovLoginController { Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); if (isAuthenticated) return "redirect:/cmm/main/mainPage.do"; + // initRsa(request); //로그인 페이지 접근시 IP체크 제거_로그인 버튼 클릭 시 로그인 유형에 따라 체크로 변경_221011_이준호 @@ -570,7 +571,7 @@ public class EgovLoginController { * return * empty = "인증번호 발송 내역이 없습니다. 최고관리자에게 문의하세요." * success = "5분이내 발송 내역 비교, 인증번호 비교 시 일치" - * smsCertFlag = true + * smsCertFlag = true * checkNoFail = "인증번호를 확인해 주세요" * timeOut = "인증번호 시간이 초과되었습니다. \\n 인증번호를 다시 발송합니다." * Exception = "에러가 발생하였습니다. 다시 시도해 주세요. \\n 에러가 지속될 시 최고관리자에게 문의하세요."; @@ -582,14 +583,14 @@ public class EgovLoginController { * */ String result = otpCertUtil.otpCert(loginVO, resultVO); -// 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")) { + 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("checkNoFail")) { // loginService.updatePassMissPlus(loginVO); // model.addAttribute("message", "인증번호를 확인해 주세요"); // model.addAttribute("message_auth", "미허용 IP에서 접속하셨습니다. \\n등록 된 휴대폰 번호로 발송된 인증번호를 입력해주세요."); @@ -602,31 +603,23 @@ public class EgovLoginController { // // 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"; -// } + 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) { @@ -698,7 +691,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"); 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 43507ac9..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,34 +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# - ) - - + ( + 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/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp index 14251b52..66e845a0 100644 --- a/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/uat/uia/EgovLoginUsr.jsp @@ -79,7 +79,7 @@ function actionLogin() { return false; } - else if (document.loginForm.checkNo.value ==""){ + else if (document.loginForm.certNum.value ==""){ alert("인증번호를 입력하세요."); return false; } @@ -96,7 +96,7 @@ function actionLogin() { $("#id").val(id); $("#password").val(pw); $("#password2").val(pw); - + document.loginForm.action=""; saveid(document.loginForm); document.loginForm.submit(); @@ -169,6 +169,7 @@ function optCertNumSms(){ success: function (returnData, status) { console.log(returnData.result); if(returnData.result == 'SUCCESS'){ + alert("인증번호가 발송되었습니다. \n 발송된 인증번호를 입력해주세요."); }else{ alert(returnData.message); } @@ -176,6 +177,10 @@ function optCertNumSms(){ error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); } }); } + +function onlyNumber(thisObj) { + thisObj.value = thisObj.value.replace(/[^0-9]/gi, ""); +} @@ -196,19 +201,21 @@ function optCertNumSms(){
예문내용내용
적용할 진행상태 + + +
첨부파일
- +
@@ -102,14 +92,13 @@ $(document).ready(function(){ @@ -118,16 +107,18 @@ $(document).ready(function(){ 내용
- + -<%-- --%> - + + +
- 1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다 +
-
+
+ " /> +
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 From 78d717adae3ac19f249dae2ac46f587fd44ed366 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 14 Oct 2022 12:10:57 +0900 Subject: [PATCH 14/16] =?UTF-8?q?feat:[=EB=8C=80=EA=B5=AD=EB=AF=BC]?= =?UTF-8?q?=EB=8B=B5=EB=B3=80=EC=84=9C=20=EC=98=88=EB=AC=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjst/web/AdjstReqWebController.java | 15 ++++++---- .../web/AdjstExpDetailController.java | 2 +- .../jsp/web/kccadr/accdnt/ans/ansSubmit.jsp | 4 +-- .../adjst/popup/adjstReqOpenExamplePop.jsp | 21 +++++++------- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 28 +++++++++++-------- 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 4b47561e..260ed2b2 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -259,8 +259,6 @@ public class AdjstReqWebController { @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 exmp = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); // if (exmp != null && StringUtils.isNotBlank(exmp.getAtchFileId())) { @@ -272,8 +270,15 @@ public class AdjstReqWebController { 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 { @@ -287,7 +292,7 @@ public class AdjstReqWebController { model.addAttribute("exmp", exmp); return "/web/kccadr/adjst/popup/adjstReqOpenAnswerExamplePop"; } - + /** * 조정신청 구분선택 - 안내화면 diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index b9955176..43b35a2c 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -179,7 +179,7 @@ public class AdjstExpDetailController { * 조정신청 구분선택 - 안내화면 */ @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/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp index e8bf1164..df49095f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp @@ -190,11 +190,11 @@

필수입력 항목*

답변내용

- + - + 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 869e8d1f..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 @@ -21,16 +21,14 @@ $(document).ready(function(){ // 레이어팝업 포커싱 이동 수정 var popupTit = $(".cont_tit03").text(); - $(".tooltip-close").click(function(){ - var activeTarget = $('[data-tooltip-con="fee_info_popup"]'); - activeTarget.hide(); - $('[data-tooltip="fee_info_popup"]').eq(0).focus(); - }); + $(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="fee_info_popup"]'); + activeTarget.hide(); + $('[data-tooltip="fee_info_popup"]').eq(0).focus(); + }); + + - /* - * init - * json으로 데이터 받아오기 - */ var data = new FormData(document.getElementById("selectForm")); $.ajax({ type:"POST", @@ -51,7 +49,9 @@ $(document).ready(function(){ } }); -s /* + + + /* * 저작물 변경 event */ $('#selectId').on('change', function(){ @@ -113,6 +113,7 @@ s /*
+
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..92e6a2a0 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 @@ -1224,8 +1224,14 @@ var AdjstReq = { ); }, openExamplePop : function(exmpCd){ + /* + - 01 : 신청취지 + - 02 : 신청원인 + - 04 : 답변서 + - 05 : 사건진행도움말 + */ var uri = ''; - if(exmpCd == '01') + if(exmpCd == '01' || exmpCd == '04') { uri = "adjstReqOpenExamplePop.do"; } @@ -1254,16 +1260,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(); From 859b59db728ee82bfc751a11a1655e6436a4c02e Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 14 Oct 2022 14:33:17 +0900 Subject: [PATCH 15/16] =?UTF-8?q?refactor:=EC=9D=98=EA=B2=AC=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=99=94=EB=A9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp index 2b343f93..5692c3f4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp @@ -148,8 +148,6 @@ - -

조정부

@@ -297,6 +295,35 @@ +
+ + + + + + + + + + + + + + +<%-- --%> + +<%-- --%> + + + + + + +
일자내용조정위원
등록된 의견이 없습니다.
의견 + +
+
+ <%--의견등록--%>
From 9e15be3c8906fbe858011f312bfdb42c8a8e88f7 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Fri, 14 Oct 2022 16:17:35 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC=20=EB=A0=88?= =?UTF-8?q?=EB=93=9C=EB=A7=88=EC=9D=B8=20#2833,=20#2834=20=EC=9D=98?= =?UTF-8?q?=EA=B2=AC=20=EB=93=B1=EB=A1=9D,=20=EC=9D=98=EA=B2=AC=20-=20?= =?UTF-8?q?=EC=9E=90=EC=A3=BC=EC=93=B0=EB=8A=94=20=EC=9D=98=EA=B2=AC=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjstConciliatorController.java | 11 +- .../jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp | 38 +++++-- .../adjcclt/popup/adjstOpinionsPopList.jsp | 106 ++++++++++++++++++ .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 19 ++++ src/main/webapp/kccadrPb/usr/css/content.css | 8 ++ 5 files changed, 173 insertions(+), 9 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp 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/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp index 5692c3f4..4591ac15 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp @@ -12,6 +12,7 @@ 기일조서 상세 + + + + + + + + +" /> +" /> + +
+
+

자주쓰는 의견 목록

+
+
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
자주쓰는 의견 목록 : 유형, 내용, 선택등의 정보제공
유형내용선택
기일조서피신청인이 제1항 의무를 성실히 이행할 경우 어쩌고저쩌고
+ + +<%-- --%> + + +
+ +
+
+
+ + + 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 92e6a2a0..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,6 +1223,25 @@ 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 : 신청취지 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;}