From c885445fe99790fb419a8377e8e09dfd2ed3e6cf Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 7 Mar 2025 18:26:03 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=A1=B0?= =?UTF-8?q?=EC=A7=81=20=EA=B0=9C=ED=8E=B8=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/seed/utils/SeedConstants.java | 30 +- .../sqlmap/com/cmm/snd/Send_SQL_Oracle.xml | 18 +- .../config/mappers/common/common_sql.xml | 19 +- .../trublcfrncmng/trublcfrncmng_sql.xml | 16 +- .../config/mappers/trublend/trublend_sql.xml | 2 +- .../trublprocessmng/trublprocessmng_sql.xml | 794 +++++++++++++++++- .../trublreqstmng/trublreqstmng_sql.xml | 46 +- .../mappers/trubltrnsfer/trubltrnsfer_sql.xml | 4 +- .../web/user/mediation/mediationStep04_3.jsp | 27 +- .../web/user/mediation/mediationStep04_4.jsp | 30 +- .../WEB-INF/jsp/seed/_extra/gtm/join/list.jsp | 23 +- .../WEB-INF/jsp/seed/_extra/gtm/team/list.jsp | 20 +- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 117 +-- .../_extra/gtm/trublreqstmng/administList.jsp | 12 +- .../_extra/gtm/trublreqstmng/administView.jsp | 63 +- .../gtm/trublreqstmng/administWrite.jsp | 27 +- .../gtm/trubltrnsfer/trubltrnsferEdit.jsp | 37 +- 17 files changed, 1098 insertions(+), 187 deletions(-) diff --git a/src/main/java/seed/utils/SeedConstants.java b/src/main/java/seed/utils/SeedConstants.java index f2d9d629..ac92577e 100644 --- a/src/main/java/seed/utils/SeedConstants.java +++ b/src/main/java/seed/utils/SeedConstants.java @@ -50,13 +50,13 @@ public class SeedConstants { */ public static final String BUNJAENG = "1003000000"; //분쟁조정실 /** - * 부서(소속) - 공정거래팀 + * 부서(소속) - 공정약관1팀 */ - public static final String GONGJEONG = "1004000000"; //공정거래팀 + public static final String GONGJEONG1 = "1004000000"; //공정약관1팀 /** - * 부서(소속) - 가맹유통플랫폼팀 + * 부서(소속) - 가맹대리점유통팀 */ - public static final String GAMAENG = "1005000000"; //가맹유통플랫폼팀 + public static final String GAMAENG = "1005000000"; //가맹대리점유통팀 /** * 부서(소속) - 건설하도급팀 */ @@ -68,7 +68,7 @@ public class SeedConstants { /** * 부서(소속) - 약관팀 */ - public static final String YAKGWAN = "1008000000"; //약관팀 + public static final String YAKGWAN1 = "1008000000"; //약관1팀 /** * 부서(소속) - 대리점팀 */ @@ -81,14 +81,26 @@ public class SeedConstants { * 부서(소속) - 관리팀 */ public static final String GWANRI = "1020000000"; //관리팀 - /** - * 부서(소속) - 플랫폼팀 - */ - public static final String PEULLAETPOM = "1040000000"; //플랫폼팀 /** * 부서(소속) - 유통팀 */ public static final String YUTONG = "1030000000"; //유통팀 + /** + * 부서(소속) - 플랫폼1팀 + */ + public static final String PEULLAETPOM1 = "1040000000"; //플랫폼1팀 + /** + * 부서(소속) - 약관2팀 + */ + public static final String YAKGWAN2 = "1041000000"; //약관2팀 + /** + * 부서(소속) - 플랫폼2팀 + */ + public static final String PEULLAETPOM2 = "1042000000"; //플랫폼2팀 + /** + * 부서(소속) - 공정약관2팀 + */ + public static final String GONGJEONG2 = "1043000000"; //공정약관2팀 diff --git a/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml index 355e27cf..ed850120 100644 --- a/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/com/cmm/snd/Send_SQL_Oracle.xml @@ -58,23 +58,31 @@ WHEN '1003000000' THEN '분쟁조정실' WHEN '1004000000' THEN - '공정거래팀' + '공정약관1팀' WHEN '1005000000' THEN - '가맹거래팀' + '가맹대리점유통팀' WHEN '1006000000' THEN '건설하도급팀' WHEN '1007000000' THEN '제조하도급팀' WHEN '1008000000' THEN - '약관팀' - WHEN '1030000000' THEN - '유통팀' + '약관1팀' WHEN '1009000000' THEN '대리점팀' WHEN '1010000000' THEN '민원상담센터' WHEN '1020000000' THEN '관리팀' + WHEN '1030000000' THEN + '유통팀' + WHEN '1040000000' THEN + '플랫폼1팀' + WHEN '1041000000' THEN + '약관2팀' + WHEN '1042000000' THEN + '플랫폼2팀' + WHEN '1043000000' THEN + '공정약관2팀' ELSE '기타' END AS MEMBER_DEPT, diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml index 83b81687..10d523be 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml @@ -67,7 +67,7 @@ CODE_IDXS != '0200000000' AND CODE_PARENT_IDX = '0200000000' AND CODE_STATUS = 'U' - + AND CODE_IDXS = '0201000000' @@ -76,7 +76,7 @@ AND CODE_IDXS = '0203000000' - + AND CODE_IDXS = '0205000000' @@ -97,7 +97,7 @@ CODE_IDXS != '0200000000' AND CODE_PARENT_IDX = '0200000000' AND CODE_STATUS = 'U' - + AND CODE_IDXS != '0201000000' @@ -106,7 +106,7 @@ AND CODE_IDXS != '0203000000' - + AND CODE_IDXS != '0205000000' @@ -381,16 +381,17 @@ MEMBER_ID AS code FROM T_MEMBER WHERE MEMBER_STATUS = 'U' - AND ( + AND (MEMBER_DEPT = ${memberDept} OR ENABLE_DEPT LIKE '%' || ${memberDept} || '%') + + - + 가맹유통, 유통, 플랫폼팀 OR MEMBER_DEPT IN ('1005000000', '1040000000', '1030000000') - + 대리, 약관팀 OR MEMBER_DEPT IN ('1009000000', '1008000000') - ) + ) --> ORDER BY MEMBER_NAME diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index b075ca3f..b97325a1 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -165,7 +165,7 @@ FROM C_CFRNCMANAGE A - + AND CASE_GUBUN = '0201000000' @@ -174,7 +174,7 @@ AND CASE_GUBUN = '0203000000' - + AND CASE_GUBUN = '0205000000' @@ -212,7 +212,7 @@ FROM C_CFRNCMANAGE A - + AND CASE_GUBUN = '0201000000' @@ -221,7 +221,7 @@ AND CASE_GUBUN = '0203000000' - + AND CASE_GUBUN = '0205000000' @@ -363,11 +363,11 @@ AND CASE_GUBUN = '1702000000' - + AND CASE_GUBUN = '1703000000' - + AND CASE_GUBUN = '1705000000' @@ -1735,7 +1735,7 @@ FROM C_CFRNCMANAGE A - + AND CASE_GUBUN = '0201000000' @@ -1744,7 +1744,7 @@ AND CASE_GUBUN = '0203000000' - + AND CASE_GUBUN = '0205000000' diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml index bc943270..1d665fba 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml @@ -153,7 +153,7 @@ - AND C.TIMHDER_ASSIGN IN('1004000000','1005000000','1006000000','1007000000','1008000000','1009000000') + AND C.TIMHDER_ASSIGN IN('1004000000', '1043000000','1005000000','1006000000','1007000000','1008000000', '1041000000' ,'1009000000') diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml index 1031526c..ed8d677d 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml @@ -18,7 +18,8 @@ - @@ -591,7 +592,7 @@ - SELECT COUNT(*) AS TOTCNT FROM ( @@ -779,8 +780,601 @@ + + + + - SELECT CM.CASE_NO, CM.CASE_GUBUN, CASE CM.CASE_GUBUN @@ -1030,6 +1624,200 @@ AND 2 > rownum + diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp index 99e17311..2f20cba8 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp @@ -32,17 +32,15 @@
- + - + - + - + @@ -5213,13 +5215,14 @@ function docOpen(obj) { - + - + @@ -5229,7 +5232,7 @@ function docOpen(obj) { - + @@ -5241,7 +5244,7 @@ function docOpen(obj) { - +
- + >서울지방공정거래사무소 >부산지방공정거래사무소 @@ -5464,7 +5467,7 @@ function docOpen(obj) { - + >공정거래위원회 @@ -5472,22 +5475,22 @@ function docOpen(obj) { - +
@@ -5587,7 +5590,7 @@ function docOpen(obj) { - + @@ -5748,7 +5751,7 @@ function docOpen(obj) {
- +
@@ -5841,7 +5844,7 @@ function docOpen(obj) {
- +
@@ -5933,7 +5936,7 @@ function docOpen(obj) {
- +
@@ -6019,7 +6022,7 @@ function docOpen(obj) {
- +
@@ -6048,7 +6051,7 @@ function docOpen(obj) {
- +
@@ -6077,7 +6080,7 @@ function docOpen(obj) {
- +
@@ -6135,7 +6138,7 @@ function docOpen(obj) {
- +
@@ -6164,7 +6167,7 @@ function docOpen(obj) {
- +
@@ -6197,7 +6200,7 @@ function docOpen(obj) {
- +
@@ -6226,7 +6229,7 @@ function docOpen(obj) {
- +
@@ -6323,7 +6326,7 @@ function docOpen(obj) {
- +
@@ -6353,7 +6356,7 @@ function docOpen(obj) {
- +
@@ -6383,7 +6386,7 @@ function docOpen(obj) {
- +
@@ -6411,7 +6414,7 @@ function docOpen(obj) {
- +
@@ -6439,7 +6442,7 @@ function docOpen(obj) {
- +
@@ -6712,7 +6715,7 @@ function docOpen(obj) { - + 당사자간 합의가 완료되어
조정조서 작성을 요청하는
사안인지 여부 @@ -6729,7 +6732,7 @@ function docOpen(obj) { - + 동일사안 공정거래위원회
시정조치 여부 @@ -6761,7 +6764,7 @@ function docOpen(obj) {
신청인 기입사항
- + @@ -7662,7 +7665,7 @@ function docOpen(obj) {
신청인 대리인 기입사항
- + @@ -7863,7 +7866,7 @@ function docOpen(obj) {
피신청인 기입사항
- + @@ -8713,7 +8716,7 @@ function docOpen(obj) {
피신청인 대리인 기입사항
- + @@ -9743,7 +9746,7 @@ function docOpen(obj) {
- +
@@ -9768,7 +9771,7 @@ function docOpen(obj) {
- +
@@ -9776,7 +9779,7 @@ function docOpen(obj) { - +
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administList.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administList.jsp index 9bb09126..a8c0c79a 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administList.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administList.jsp @@ -210,17 +210,17 @@
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp index e2112b77..07143374 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp @@ -10,13 +10,13 @@ $(document).ready(function(){ $("#confirmBtnHide2").hide(); - if('${recptmsData.caseGubun}' == '0203000000'){ + if('${recptmsData.caseGubun}' == '${SeedConstants.HADOGEUPGEORAE}'){ $("#isShow02").hide(); $("#isShow03").hide(); - }else if('${recptmsData.caseGubun}' == '0202000000'){ + }else if('${recptmsData.caseGubun}' == '${SeedConstants.GAMAENGGEORAE}'){ $("#isShow01").hide(); $("#isShow03").hide(); - }else if('${recptmsData.caseGubun}' == '0204000000'){ + }else if('${recptmsData.caseGubun}' == '${SeedConstants.DAEGYUMOGEORAE}'){ $("#isShow01").hide(); $("#isShow02").hide(); }else{ @@ -466,15 +466,15 @@ $(document).ready(function(){ } } - if($("#caseGubun").val() == '0203000000'){ + if($("#caseGubun").val() == '${SeedConstants.HADOGEUPGEORAE}'){ $("#isShow01").show(); $("#isShow02").hide(); $("#isShow03").hide(); - }else if($("#caseGubun").val() == '0202000000'){ + }else if($("#caseGubun").val() == '${SeedConstants.GAMAENGGEORAE}'){ $("#isShow01").hide(); $("#isShow02").show(); $("#isShow03").hide(); - }else if($("#caseGubun").val() == '0204000000'){ + }else if($("#caseGubun").val() == '${SeedConstants.DAEGYUMOGEORAE}'){ $("#isShow01").hide(); $("#isShow02").hide(); $("#isShow03").show(); @@ -486,21 +486,28 @@ $(document).ready(function(){ }); + /* 부서변경 시 조정유형도 selected 처리 */ $("#presidentAssign").change(function(){ var presidentAssignVal = ""; - if($("#presidentAssign").val() == '1004000000' || $("#presidentAssign").val() == '1040000000'){ - presidentAssignVal = "0201000000"; - }else if($("#presidentAssign").val() == '1005000000'){ - presidentAssignVal = "0202000000"; - }else if($("#presidentAssign").val() == '1006000000' || $("#presidentAssign").val() == '1007000000'){ - presidentAssignVal = "0203000000"; - }else if($("#presidentAssign").val() == '1008000000'){ - presidentAssignVal = "0205000000"; - }else if($("#presidentAssign").val() == '1030000000'){ - presidentAssignVal = "0204000000"; - }else if($("#presidentAssign").val() == '1009000000'){ - presidentAssignVal = "0206000000"; + if($("#presidentAssign").val() == '${SeedConstants.GONGJEONG1}' || $("#presidentAssign").val() == '${SeedConstants.GONGJEONG2}' + || $("#presidentAssign").val() == '${SeedConstants.PEULLAETPOM1}' || $("#presidentAssign").val() == '${SeedConstants.PEULLAETPOM2}'){ + presidentAssignVal = "${SeedConstants.GONGJEONGGEORAE}"; //공정약관1,2팀. 플랫폼1,2팀 부서 지정 시 공정거래 유형 + + }else if($("#presidentAssign").val() == '${SeedConstants.GAMAENG}'){ + presidentAssignVal = "${SeedConstants.GAMAENGGEORAE}"; //가맹대리점유통팀 부서 지정 시 가맹사업거래 + + }else if($("#presidentAssign").val() == '${SeedConstants.GEONSEOL}' || $("#presidentAssign").val() == '${SeedConstants.JEJO}'){ + presidentAssignVal = "${SeedConstants.HADOGEUPGEORAE}"; //건설, 제조 부서 지정 시 하도급 거래 + + }else if($("#presidentAssign").val() == '${SeedConstants.YAKGWAN1}' || $("#presidentAssign").val() == '${SeedConstants.YAKGWAN2}'){ + presidentAssignVal = "${SeedConstants.YAKGWANGEORAE}"; //약관1,2팀 부서 지정 시 약관거래 + + }else if($("#presidentAssign").val() == '${SeedConstants.YUTONG}'){ + presidentAssignVal = "${SeedConstants.DAEGYUMOGEORAE}"; //유통팀 부서 지정 시 유통거래 + + }else if($("#presidentAssign").val() == '${SeedConstants.DAERIJEOM}'){ + presidentAssignVal = "${SeedConstants.DAERIJEOMGEORAE}"; //대리점팀 부서 지정 시 대리점거래 } var optionList = $("#caseGubun option"); @@ -511,15 +518,15 @@ $(document).ready(function(){ } } - if($("#caseGubun").val() == '0203000000'){ + if($("#caseGubun").val() == '${SeedConstants.HADOGEUPGEORAE}'){ $("#isShow01").show(); $("#isShow02").hide(); $("#isShow03").hide(); - }else if($("#caseGubun").val() == '0202000000'){ + }else if($("#caseGubun").val() == '${SeedConstants.GAMAENGGEORAE}'){ $("#isShow01").hide(); $("#isShow02").show(); $("#isShow03").hide(); - }else if($("#caseGubun").val() == '0204000000'){ + }else if($("#caseGubun").val() == '${SeedConstants.DAEGYUMOGEORAE}'){ $("#isShow01").hide(); $("#isShow02").hide(); $("#isShow03").show(); @@ -667,11 +674,12 @@ $(document).ready(function(){ tempAssign = '1009000000'; } }else if('${memberPosition}' == '0911000000'){ - if('${recptmsData.timhderAssign}' != ''){ + /* if('${recptmsData.timhderAssign}' != ''){ tempAssign = '${recptmsData.timhderAssign}'; }else{ tempAssign = '${recptmsData.scchfAssign}'; - } + } */ + tempAssign = '${memberDept}'; } if(optionList[i].value == tempAssign){ @@ -1029,7 +1037,14 @@ function addComma2(num,fLen) { } function changeAssign(){ - if($("#presidentAssign").val() != '${recptmsData.timhderAssign}'){ + /* if($("#presidentAssign").val() != '${recptmsData.timhderAssign}'){ */ + if( + $("#presidentAssign").val() != '${memberDept}' && /* 현재소속과 다른 소속 선택 시 권한 없음 */ + !( + ($("#presidentAssign").val() == '1040000000' && '${memberDept}' == '${SeedConstants.GONGJEONG1}') || /* 그러나 공정1/2팀은 플랫폼 1/2팀 권한 가능 */ + ($("#presidentAssign").val() == '1042000000' && '${memberDept}' == '${SeedConstants.GONGJEONG2}') + ) + ){ alert("타 부서 배정 권한이 없습니다"); diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp index 5cd9887c..a764349e 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp @@ -2,6 +2,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@page import="seed.utils.SeedConstants"%>