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 @@
분쟁조정 - 조정신청 - 온라인신청 선택
당사자, 주소, 연락처, 신청취지, 신청원인 등 신청서 세부 내용 기재
+당사자, 주소, 연락처, 신청취지, 신청이유 등 신청서 세부 내용 기재
증빙자료 첨부
@@ -151,7 +151,7 @@조정신청 양식 다운로드(신청인이 법인이거나 당사자가 아닌 경우, 조정신청 위임장 및 조정대리신청서 양식을 다운로드 후 작성)
당사자, 주소, 연락처, 신청취지, 신청원인 등 신청서 세부내용 기재
+당사자, 주소, 연락처, 신청취지, 신청이유 등 신청서 세부내용 기재
조정조사관의 메일(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 @@
<%--
별지 조정신청 해당란 기재와 같다.
별지 조정신청 해당란 기재와 같다.
별지 조정신청 해당란 기재와 같다.