From ed5c1b6e693ef133afb4cfcb487298da5423847b Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 24 Dec 2024 16:57:49 +0900 Subject: [PATCH] =?UTF-8?q?2024-12-24=2016:57=20g/w=20=EA=B8=B0=EC=95=88?= =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seed/com/gtm/base/GwBaseController.java | 109 ++++++++++++++++-- .../WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp | 2 + .../jsp/seed/_extra/gtm/join/write.jsp | 2 + .../_extra/gtm/trublcfrncmng/endNticeView.jsp | 2 +- .../_extra/gtm/trublcfrncmng/redyEdit.jsp | 2 +- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 34 +++--- 6 files changed, 125 insertions(+), 26 deletions(-) diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java index f8ba9d78..5fea9af2 100644 --- a/src/main/java/seed/com/gtm/base/GwBaseController.java +++ b/src/main/java/seed/com/gtm/base/GwBaseController.java @@ -167,7 +167,8 @@ public class GwBaseController { try { //params.put("gwData", JSPUtil.fixNull(service.memberNewOne(params))); Map tmap = (Map) JSPUtil.fixNull(memberService.memberNewOne(params)); - params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + //params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + params.put("gwId", this.getGWID(tmap)); }catch(Exception ex) { ex.printStackTrace(); @@ -552,7 +553,8 @@ public class GwBaseController { try { //params.put("gwData", JSPUtil.fixNull(service.memberNewOne(params))); Map tmap = (Map) JSPUtil.fixNull(memberService.memberNewOne(params)); - params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + //params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + params.put("gwId", this.getGWID(tmap)); }catch(Exception ex) { ex.printStackTrace(); @@ -676,22 +678,32 @@ public class GwBaseController { try { //params.put("gwData", JSPUtil.fixNull(service.memberNewOne(params))); Map tmap = (Map) JSPUtil.fixNull(memberService.memberNewOne(params)); - params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + //params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + //params.put("gwId", tmap.get("MEMBER_ID").toString()); + params.put("gwId", this.getGWID(tmap)); + + System.out.println(tmap.get("MEMBER_ID").toString()); + System.out.println(tmap.get("MEMBER_ID").toString()); + System.out.println(tmap.get("MEMBER_ID").toString()); }catch(Exception ex) { ex.printStackTrace(); } + String s_nanumCaseGubun = ""; + try { - s_jobID = params.get("jobID").toString(); + s_jobID = params.get("jobID").toString(); + s_nanumCaseGubun = params.get("caseGubun").toString(); + }catch(Exception ex) { ex.printStackTrace(); } System.out.println("type"); + System.out.println("s_nanumCaseGubun"); + System.out.println(s_nanumCaseGubun); System.out.println(type); - System.out.println(type); - if("S".equals(type)){ //작성용 //SanctnhistoryInsNew - pageAction @@ -702,7 +714,7 @@ public class GwBaseController { if ("1".equals(s_jobID)) //소제기 내부보고 { - paramsCnt.put("docId", "78"); + paramsCnt.put("docId", "78"); }else if ("2".equals(s_jobID)) //당사자 통지 { @@ -710,7 +722,34 @@ public class GwBaseController { }else if ("3".equals(s_jobID)) //수소법원 통지 { - paramsCnt.put("docId", "22"); + /* + * 공정거래 0201000000 + 가맹사업거래 0202000000 + 하도급거래 0203000000 + 대규모유통거래 0204000000 + 약관거래 0205000000 + 대리점거래 0206000000 + */ + if ("0201000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "366"); + + }else if ("0202000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "363"); + + }else if ("0203000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "378"); + + }else if ("0204000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "375"); + + }else if ("0205000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "372"); + + }else if ("0206000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "369"); + }else{ + paramsCnt.put("docId", "22"); + } }else if ("4".equals(s_jobID)) //회의개최 통보(추가) { @@ -718,8 +757,50 @@ public class GwBaseController { }else if ("5".equals(s_jobID)) //협의회 종료통지(사무소별) { - paramsCnt.put("docId", "22"); - + if ("0201000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "350"); + + }else if ("0202000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "349"); + + }else if ("0203000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "354"); + + }else if ("0204000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "353"); + + }else if ("0205000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "352"); + + }else if ("0206000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "351"); + }else{ + paramsCnt.put("docId", "22"); + } + + }else if ("6".equals(s_jobID)) //공정위 접수사실 보고 + { + if ("0201000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "386"); + + }else if ("0202000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "385"); + + }else if ("0203000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "388"); + /* + }else if ("0204000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "353"); + + }else if ("0205000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "352"); + */ + + }else if ("0206000000".equals(s_nanumCaseGubun)) { + paramsCnt.put("docId", "387"); + }else{ + paramsCnt.put("docId", "22"); + } } params.put("data0", paramsCnt); @@ -5675,6 +5756,14 @@ v_ret = this.receiverHeader(); return v_ret; } + + private String getGWID(Map p_tmap) { + //Map tmap = (Map) JSPUtil.fixNull(memberService.memberNewOne(params)); + return p_tmap.get("MEMBER_ITEM_F6").toString(); + //return p_tmap.get("MEMBER_ID").toString(); + //params.put("gwId", tmap.get("MEMBER_ID").toString()); + //params.put("gwId", tmap.get("MEMBER_ITEM_F6").toString()); + } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // 4.기존 로직 diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp index 737ef95a..0b365136 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp @@ -64,12 +64,14 @@ +

* 생년월일

diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp index ca857a3e..2575ecc6 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp @@ -63,12 +63,14 @@
+

* 생년월일

diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp index cdeb9f0e..a0674ab5 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp @@ -1320,7 +1320,7 @@ function nanumCallGeneral(p_jobID, nanumSubject){ var url = ""; $("#typeNanum").val("S"); $("#jobID").val(p_jobID); - $("#nanumCaseGubun").val('${masterData.caseGubun}'); + $("#nanumCaseGubun").val($("#caseGubun").val()); var param = jQuery('#nanumFrm').serialize(); //url = "/gtm/case/ajax/SanctnhistoryInsNew.do"; url = "/gtm/newcase/ajax/SanctnhistoryInsNewGeneral.do"; diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp index 3438a62d..5525aeec 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp @@ -2001,7 +2001,7 @@ function nanumCall(no, nanumSubject){ }); } - alert(jobID); + //alert(jobID); } diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index ce93cfeb..32dce22a 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -3247,18 +3247,18 @@ function atendReqPopOpen(caseNo){ window.open(popUrl, "", popOption); } -function fileFirstPopOpen(p_caseNo, p_fileFuncType){ +function fileFirstPopOpen(p_caseNo, p_fileFuncType, p_approKey){ //alert('작업중') //return; - var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+"&fileFuncType="+p_fileFuncType; + var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey; var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;"; window.open(popUrl, "", popOption); } -function fileSecondPopOpen(p_caseNo, p_fileFuncType){ +function fileSecondPopOpen(p_caseNo, p_fileFuncType, p_approKey){ //alert('작업중') //return; - var popUrl = "/gtm/case/trublprocessmng/fileAtchPop2/jsp/Page.do?caseNo="+p_caseNo+"&fileFuncType="+p_fileFuncType; + var popUrl = "/gtm/case/trublprocessmng/fileAtchPop2/jsp/Page.do?caseNo="+p_caseNo+"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey; var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;"; window.open(popUrl, "", popOption); } @@ -3645,7 +3645,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, if (jobID=='1-1'||jobID=='2-1' ||jobID=='3-1'||jobID=='4-1' ||jobID=='5-1'||jobID=='6-1'){ - //fileFirstPopOpen($("#caseNo").val(),'X-1'); + //fileFirstPopOpen($("#caseNo").val(),'X-1',r.data2.docId); + var f = document.nanumViewFrm; f.action = $("#nanumViewFrm #gwCallUrlView").val(); f.target = "_blank"; @@ -3703,6 +3704,7 @@ function nanumCallGeneral(p_jobID, nanumSubject){ //$("#docIdImsi").val(r.data.docId); $("#nanumViewFrm #formIdView").val(r.data0.docId); + alert(r.data0.docId); //$("#nanumViewFrm #modView").val('w'); //작성 고정 //$("#approKeyImsi").val(r.data2.docId); //외부시스템 연동키 외부시스템 연동키 @@ -4726,13 +4728,16 @@ function docOpen(obj) { - +<%-- --%> + - +<%-- --%> + - + + @@ -4746,16 +4751,20 @@ function docOpen(obj) { - +<%-- --%> + + - +<%-- --%> + - + + @@ -4882,9 +4891,6 @@ function docOpen(obj) { - - -