From 8c54e0be60db77e21767fcb1820b168c24a31905 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Tue, 29 Aug 2023 12:09:00 +0900 Subject: [PATCH] =?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=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=20-=20=EC=88=98=EC=A0=95=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=EC=82=AC=ED=95=AD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java | 2 +- .../kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java | 2 +- .../adjReqMgrOff/service/AdjReqMgrOffLineVO.java | 2 +- .../adjReqMgrPast/service/AdjReqMgrPastVO.java | 2 +- .../kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java | 2 +- .../kccadr/adjreqmgr/web/AdjReqMgrController.java | 2 +- .../java/kcc/kccadr/adjst/service/AdjstReqVO.java | 2 +- .../kcc/kccadr/adjst/web/AdjstReqWebController.java | 2 +- .../java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java | 2 +- .../sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 4 ++-- .../kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml | 2 +- .../sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml | 2 +- .../sqlmap/kccadr/stts/Stts_SQL_Mysql.xml | 2 +- src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000985.jsp | 4 ++-- .../jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 2 +- .../jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp | 2 +- .../adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp | 8 ++++---- .../adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp | 4 ++-- .../kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp | 6 +++--- .../adjPgrMgr/exmp/app/exmpAppManagerModify.jsp | 4 ++-- .../adjPgrMgr/iam/internalApprovManageDetail.jsp | 4 ++-- .../WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadReg.jsp | 2 +- .../jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp | 2 +- .../jsp/kccadr/adjReqMgr/adjReqMgrRegEdit.jsp | 4 ++-- .../WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegist.jsp | 4 ++-- .../adjReqMgr/popup/adjReqMgrRegSecurityPopup.jsp | 2 +- .../jsp/kccadr/adjReqMgrOff/adjReqMgrOffDetail.jsp | 2 +- .../jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp | 4 ++-- .../jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp | 4 ++-- .../adjReqMgrPast/adjReqMgrPastBasicRegist.jsp | 2 +- .../jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp | 2 +- .../jsp/kccadr/adjclsmgr/adjRecommendationDetail.jsp | 2 +- .../web/kccadr/accdnt/acd/adjstChangeDateCreate.jsp | 2 +- .../web/kccadr/accdnt/acd/adjstChangeDateModify.jsp | 2 +- .../jsp/web/kccadr/accdnt/ai/adjstIncidentDetail.jsp | 4 ++-- .../web/kccadr/accdnt/ai/adjstIncidentDetailPdf.jsp | 4 ++-- .../web/kccadr/accdnt/ai/adjstIncidentEndDetail.jsp | 4 ++-- .../kccadr/accdnt/ai/popup/adjstIncidentReqEdit.jsp | 2 +- .../accdnt/ai/popup/adjstIncidentReqViewPop.jsp | 2 +- .../accdnt/ars/tab/adjstCloseDetailTabNormal.jsp | 4 ++-- .../kccadr/accdnt/ars/tab/adjstCloseTabDetail.jsp | 2 +- .../accdnt/ars/tab/adjstReqStatusTabDetail.jsp | 8 ++++---- .../web/kccadr/accdnt/ars/tab/docIssReqViewPop.jsp | 2 +- .../web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp | 2 +- .../jsp/web/kccadr/adjcclt/adjstProtocolDetail.jsp | 4 ++-- .../web/kccadr/adjcclt/adjstRecommendationDetail.jsp | 4 ++-- .../kccadr/adjcclt/tab/adjstConciliatorTabInfo.jsp | 4 ++-- .../WEB-INF/jsp/web/kccadr/adjst/adjstReq4Regist.jsp | 6 +++--- .../jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp | 12 ++++++------ .../kccadr/adjstExpDetail/adjstIncidentDetail.jsp | 6 +++--- .../kccadr/adjstExpDetail/adjstIncidentEndDetail.jsp | 4 ++-- .../adjstExpDetail/adjstReqStatusTabDetail.jsp | 4 ++-- .../web/kccadr/adjstExpDetail/docIssReqViewPop.jsp | 2 +- .../adjstExpDetail/expAdjstChangeDateCreate.jsp | 2 +- .../WEB-INF/jsp/web/kccadr/certDoc/armDetail.jsp | 2 +- .../WEB-INF/jsp/web/kccadr/certDoc/certDocList.jsp | 2 +- .../jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp | 8 ++++---- src/main/webapp/js/page/adjstReq/adjstReq.js | 4 ++-- 61 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index ce3ac4f7..177813aa 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -79,7 +79,7 @@ public class PgrCmmVO implements Serializable { private String registDay; private String registTime; private String reqCn1; // 사건내용(신청취지) - private String reqCn2; // 사건내용(신청원인) + private String reqCn2; // 사건내용(신청이유) private String reqOlCd; // 온_오프라인_신청구분 private String reqOlCdTx; 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 b0d8aca0..cf90e642 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java @@ -13,7 +13,7 @@ import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageVO; * @description : * @exmp_cd * - 01 : 신청취지 - * - 02 : 신청원인 + * - 02 : 신청이유 * - 03 : 의견 * - 04 : 답변서 * - 05 : 사건진행도움말 diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java index 081d975a..384e288c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java @@ -31,7 +31,7 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { private String statCd = ""; // 조정사건상태 private String reqOlCd = ""; // 온_오프라인_신청구분 private String reqCn1 = ""; // 신청취지 - private String reqCn2 = ""; // 신청원인 + private String reqCn2 = ""; // 신청이유 private String reqTy = ""; // 신청유형 private String ccTy = ""; // 저작물종류 private String sbmtYn = ""; // 제출여부 diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 68ed976e..9ca26541 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -55,7 +55,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String statTx = ""; // 조정사건상태 private String reqOlCd = ""; // 온_오프라인_신청구분 private String reqCn1 = ""; // 신청취지 - private String reqCn2 = ""; // 신청원인 + private String reqCn2 = ""; // 신청이유 private String reqTy = ""; // 신청유형 private String ccTy = ""; // 저작물종류 private String sbmtYn = ""; // 제출여부 diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java index 903df778..8c504bf8 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java @@ -41,7 +41,7 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ private String statCd = ""; // 조정사건상태 private String reqOlCd = ""; // 온_오프라인_신청구분 private String reqCn1 = ""; // 신청취지 - private String reqCn2 = ""; // 신청원인 + private String reqCn2 = ""; // 신청이유 private String reqTy = ""; // 신청유형 private String ccTy = ""; // 저작물종류 private String sbmtYn = ""; // 제출여부 diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index 9f96a513..f45ed2cd 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -1267,7 +1267,7 @@ public class AdjReqMgrController { String adrNo = adjReqVO.getAdrNo(); //조정사건번호 //엔터문자 변경해주기 - \n\r -> \\n\\r로 json 데이터 전달해야한다고 함(오즈리포트) String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 - String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청이유 if(StringUtil.isNotEmpty(rpplNm)) { diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 4952e2be..313f2492 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -45,7 +45,7 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { private String statNm = ""; // 조정사건상태명 private String reqOlCd = ""; // 온_오프라인_신청구분 private String reqCn1 = ""; // 신청취지 - private String reqCn2 = ""; // 신청원인 + private String reqCn2 = ""; // 신청이유 private String reqTy = ""; // 신청유형 private String ccTy = ""; // 저작물종류 private String sbmtYn = ""; // 제출여부 diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 15164954..23742405 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1708,7 +1708,7 @@ public class AdjstReqWebController { String adrNo = adjReqVO.getAdrNo(); //조정사건번호 //엔터문자 변경해주기 - \n\r -> \\n\\r로 json 데이터 전달해야한다고 함(오즈리포트) String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 - String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청이유 // 조정신청 3step 미리보기 시 신청 취지/원인에 데이터가 없으면 'null data'로 찍혀서 공백을 띄어쓰기 한칸으로 넣기_이준호_221226 if("".equals(reqCn1)) { diff --git a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java index 99ffa55f..e71c33db 100644 --- a/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java +++ b/src/main/java/kcc/kccadr/ozSchd/web/OzSchdExportUtil.java @@ -479,7 +479,7 @@ public class OzSchdExportUtil { String adrNo = adjReqVO.getAdrNo(); //조정사건번호 //엔터문자 변경해주기 - \n\r -> \\n\\r로 json 데이터 전달해야한다고 함(오즈리포트) String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n"); //신청취지 - String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청원인 + String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n"); //신청이유 if(StringUtil.isNotEmpty(rpplNm)) { diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index e9f9ed68..40e075a0 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -191,7 +191,7 @@ , CCD.CODE_NM AS ccTyTx /* 저작물 유형_Tx */ , M.REQ_TY AS reqTy /* 신청유형 */ , M.REQ_CN1 AS reqCn1 /* 신청취지 */ - , M.REQ_CN2 AS reqCn2 /* 신청원인 */ + , M.REQ_CN2 AS reqCn2 /* 신청이유 */ , D.MEM_DEPT_SEQ AS memDeptSeq /* 조정부 */ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ @@ -549,7 +549,7 @@ , CCD.CODE_NM AS ccTyTx /* 저작물 유형_Tx */ , M.REQ_TY AS reqTy /* 신청유형 */ , M.REQ_CN1 AS reqCn1 /* 신청취지 */ - , M.REQ_CN2 AS reqCn2 /* 신청원인 */ + , M.REQ_CN2 AS reqCn2 /* 신청이유 */ , D.MEM_DEPT_SEQ AS memDeptSeq /* 조정부 */ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml index b8616d19..012edece 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml @@ -1027,7 +1027,7 @@ , CCD.CODE_NM AS ccTyTx /* 저작물 유형_Tx */ , M.REQ_TY AS reqTy /* 신청유형 */ , M.REQ_CN1 AS reqCn1 /* 신청취지 */ - , M.REQ_CN2 AS reqCn2 /* 신청원인 */ + , M.REQ_CN2 AS reqCn2 /* 신청이유 */ , D.MEM_DEPT_SEQ AS memDeptSeq /* 조정부 */ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml index 57c493e7..75470265 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml @@ -877,7 +877,7 @@ ON T1.EXMP_CC_TY = T2.EXMP_CC_TY WHERE 1=1 AND T1.EXMP_CC_TY = #exmpCcTy# - AND T2.EXMP_CD = #exmpCd# + AND T2.EXMP_CD = #exmpCd# diff --git a/src/main/resources/egovframework/sqlmap/kccadr/stts/Stts_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/stts/Stts_SQL_Mysql.xml index e203b145..7be58863 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/stts/Stts_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/stts/Stts_SQL_Mysql.xml @@ -277,7 +277,7 @@ /*신청취지*/ , M.req_cn2 AS reqCn2 - /*신청원인*/ + /*신청이유*/ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ diff --git a/src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000985.jsp b/src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000985.jsp index 37a045b1..5440012f 100644 --- a/src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000985.jsp +++ b/src/main/webapp/WEB-INF/jsp/cnt/CNT_000000000985.jsp @@ -119,7 +119,7 @@

분쟁조정 - 조정신청 - 온라인신청 선택

  • 3. -

    당사자, 주소, 연락처, 신청취지, 신청원인 등 신청서 세부 내용 기재

    +

    당사자, 주소, 연락처, 신청취지, 신청이유 등 신청서 세부 내용 기재

  • 4.

    증빙자료 첨부

    @@ -151,7 +151,7 @@

    조정신청 양식 다운로드(신청인이 법인이거나 당사자가 아닌 경우, 조정신청 위임장 및 조정대리신청서 양식을 다운로드 후 작성)

  • 3. -

    당사자, 주소, 연락처, 신청취지, 신청원인 등 신청서 세부내용 기재

    +

    당사자, 주소, 연락처, 신청취지, 신청이유 등 신청서 세부내용 기재

  • 4.

    조정조사관의 메일(adr@copyright.or.kr)로 신청서 및 증빙자료 송부 후 검토

    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp index 3e1faae4..72eac406 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrDetailPop.jsp @@ -582,7 +582,7 @@ - 신청원인 + 신청이유

    <%--   --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index 3e4870e3..3b893951 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -513,7 +513,7 @@ - 신청원인 + 신청이유

    별지 조정신청 해당란 기재와 같다.

    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp index 31ca7f6d..936a0f61 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp @@ -305,7 +305,7 @@ - 신청원인 + 신청이유

    별지 조정신청 해당란 기재와 같다.

    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp index 84a83ed7..50ff9a41 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp @@ -250,7 +250,7 @@ - 신청원인 + 신청이유

    별지 조정신청 해당란 기재와 같다.

    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 16d78d00..da146fe3 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 @@ %> -신청원인예문관리 +신청이유예문관리