From fcf1e7aee2a1b2905a0a9293d0491b448636a40a Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 4 Dec 2024 17:47:05 +0900 Subject: [PATCH] =?UTF-8?q?2024-12-04=2017:46=20=ED=98=91=EC=9D=98?= =?UTF-8?q?=ED=9A=8C=20=EC=9D=B4=EA=B4=80=20=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seed/com/gtm/base/GwBaseController.java | 162 +++++++++++++- .../_extra/gtm/trublcfrncmng/redyEdit.jsp | 4 +- .../_extra/gtm/trublcfrncmng/reportEdit.jsp | 208 +++++++++++++++++- 3 files changed, 364 insertions(+), 10 deletions(-) diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java index e40713c7..3ef76cc1 100644 --- a/src/main/java/seed/com/gtm/base/GwBaseController.java +++ b/src/main/java/seed/com/gtm/base/GwBaseController.java @@ -1,5 +1,6 @@ package seed.com.gtm.base; +import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Enumeration; @@ -95,6 +96,51 @@ public class GwBaseController { log.warn(">>>>>>type<<<<<<"+params.get("jobID")); + log.warn(">>>>>>content1<<<<<<"+params.get("content1")); + log.warn(">>>>>>content2<<<<<<"+params.get("content2")); + log.warn(">>>>>>content3<<<<<<"+params.get("content3")); + log.warn(">>>>>>content4<<<<<<"+params.get("content4")); + log.warn(">>>>>>content5<<<<<<"+params.get("content5")); + + log.warn(">>>>>>content6<<<<<<"+params.get("content6")); + log.warn(">>>>>>content7<<<<<<"+params.get("content7")); + log.warn(">>>>>>content8<<<<<<"+params.get("content8")); + log.warn(">>>>>>content9<<<<<<"+params.get("content9")); + log.warn(">>>>>>content10<<<<<<"+params.get("content10")); + + //전달받은 변수값들 decode + try { + this.chgURLDecoder(params, "content1"); + this.chgURLDecoder(params, "content2"); + this.chgURLDecoder(params, "content3"); + this.chgURLDecoder(params, "content4"); + this.chgURLDecoder(params, "content5"); + this.chgURLDecoder(params, "content6"); + this.chgURLDecoder(params, "content7"); + this.chgURLDecoder(params, "content8"); + this.chgURLDecoder(params, "content9"); + this.chgURLDecoder(params, "content10"); + this.chgURLDecoder(params, "content11"); + this.chgURLDecoder(params, "content12"); + this.chgURLDecoder(params, "content13"); + this.chgURLDecoder(params, "content14"); + this.chgURLDecoder(params, "content15"); + }catch(Exception ex) { + ex.printStackTrace(); + } + + log.warn(">>>>>>content1<<<<<<"+params.get("content1")); + log.warn(">>>>>>content2<<<<<<"+params.get("content2")); + log.warn(">>>>>>content3<<<<<<"+params.get("content3")); + log.warn(">>>>>>content4<<<<<<"+params.get("content4")); + log.warn(">>>>>>content5<<<<<<"+params.get("content5")); + + log.warn(">>>>>>content6<<<<<<"+params.get("content6")); + log.warn(">>>>>>content7<<<<<<"+params.get("content7")); + log.warn(">>>>>>content8<<<<<<"+params.get("content8")); + log.warn(">>>>>>content9<<<<<<"+params.get("content9")); + log.warn(">>>>>>content10<<<<<<"+params.get("content10")); + log.warn(">>>>>>type<<<<<<"+pageAction); //보고서 정보 @@ -296,6 +342,14 @@ public class GwBaseController { || s_jobID.indexOf("4-5")>-1 //대규모유통거래 - 0204000000 || s_jobID.indexOf("5-5")>-1 //약관거래 - 0205000000 || s_jobID.indexOf("6-5")>-1 //대리점거래 - 0206000000 + + //STEP2.결과보고 - 회의결과보고 + || "1-23".equals(s_jobID) //공정거래 - 0201000000 + || "2-23".equals(s_jobID) //가맹점사업거래 - 0202000000 + || "3-23".equals(s_jobID) //하도급거래 - 0203000000 + || "4-23".equals(s_jobID) //대규모유통거래 - 0204000000 + || "5-23".equals(s_jobID) //약관거래 - 0205000000 + || "6-23".equals(s_jobID) //대리점거래 - 0206000000 ) { //문서 고유 번호 생성 params.put("sql", "nanumSanctnhistoryDocID"); //docId @@ -318,7 +372,7 @@ public class GwBaseController { params.put("title", this.gwTitleCFRNC(s_jobID, (EgovMap)params.get("dataA"))); //본문 생성 - params.put("contents", this.gwContentsCFRNC(s_jobID, (EgovMap)params.get("data1"), (EgovMap)params.get("dataA"), (List)params.get("caseApplcntData"), (List)params.get("caseRespondentData"))); + params.put("contents", this.gwContentsCFRNC(s_jobID, (EgovMap)params.get("data1"), (EgovMap)params.get("dataA"), (List)params.get("caseApplcntData"), (List)params.get("caseRespondentData"), params)); } } @@ -825,7 +879,8 @@ public class GwBaseController { EgovMap p_data1, EgovMap p_dataA, List p_caseApplcntData, - List p_caseRespondentData + List p_caseRespondentData, + EgovMap params ) { String v_ret=""; @@ -884,7 +939,18 @@ public class GwBaseController { || "5-53".equals(p_jobID) //약관거래 - 0205000000 || "6-53".equals(p_jobID) //대리점거래 - 0206000000 ){ //하도급 출석요구 - v_ret = this.makeXBY5X(p_data1, p_dataA, p_caseApplcntData, p_caseRespondentData, p_jobID, 3); + v_ret = this.makeXBY5X(p_data1, p_dataA, p_caseApplcntData, p_caseRespondentData, p_jobID, 3); + + }else if (false + //협의회 회의계최통보 + || "1-23".equals(p_jobID) //공정거래 - 0201000000 + || "2-23".equals(p_jobID) //가맹점사업거래 - 0202000000 + || "3-23".equals(p_jobID) //하도급거래 - 0203000000 + || "4-23".equals(p_jobID) //대규모유통거래 - 0204000000 + || "5-23".equals(p_jobID) //약관거래 - 0205000000 + || "6-23".equals(p_jobID) //대리점거래 - 0206000000 + ){ //하도급 출석요구 + v_ret = this.makeXBY23(p_data1, p_dataA, p_caseApplcntData, p_caseRespondentData, p_jobID, params, 2); } }catch(Exception ex) { @@ -2988,6 +3054,90 @@ v_ret = this.receiverHeader(); + /* + * //보완요구2차 + || "1-9".equals(p_jobID) //공정거래 - 0201000000 + || "2-9".equals(p_jobID) //가맹점사업거래 - 0202000000 + || "3-9".equals(p_jobID) //하도급거래 - 0203000000 + || "4-9".equals(p_jobID) //대규모유통거래 - 0204000000 + || "5-9".equals(p_jobID) //약관거래 - 0205000000 + || "6-9".equals(p_jobID) //대리점거래 - 0206000000 + ){ //하도급 보완요구 + */ + + + //붙임 + //v_ret = v_ret +"

붙임 1. 제2022-2차 하도급분쟁조정협의회 소회의 상정안건 1부."; + //v_ret = v_ret +"
2. 제2022-2차 소회의자료 1부. 끝."; + + + v_ret = v_ret + this.bodyFooter(); + + }catch(Exception ex) { + ex.printStackTrace(); + } + + + return v_ret; + } + + //STEP2.결과보고 - 회의결과 보고 + private String makeXBY23( + EgovMap p_data1, + EgovMap p_dataA, + List p_caseApplcntData, + List p_caseRespondentData, + String p_jobID, + EgovMap params, + int p_cnt //요구회차 + ) { + String v_ret = ""; + + try { + v_ret = this.receiverHeader(); + + //수신영역 + { + v_ret = v_ret + "수신자 내부결재
"+"(경유)
"; + //v_ret = v_ret + "제목          " +p_data1.get("conferenceNames").toString()+" "+p_data1.get("conferenceGubunNm").toString()+" 안건 상정"; + v_ret = v_ret + "제목          " +p_dataA.get("conferenceNames").toString()+" 회의결과 보고"; + /* + if (p_cnt>1) { + v_ret = v_ret +"("+Integer.toString(p_cnt)+"차)"; + } + */ + //v_ret = v_ret +"
"; + } + + v_ret = v_ret + this.receiverFooter(); + + + //하단본문영역 + v_ret = v_ret + this.bodyHeader(); + + //v_ret = v_ret +"
"; + //v_ret = v_ret +p_data1.get("conferenceNames").toString()+" "+p_data1.get("conferenceGubunNm").toString()+"에서 의결할 안건을 다음과 같이 상정하고자 합니다."; + v_ret = v_ret +p_dataA.get("conferenceNames").toString()+" 회의결과를 다음과 같이 보고합니다."; + + v_ret = v_ret +"

가. 회의일자: "+params.get("content2").toString()+""; + v_ret = v_ret +"
나. 회의장소: "+params.get("content3").toString()+""; + v_ret = v_ret +"
다. 참석위원: "+params.get("content4").toString()+""; + v_ret = v_ret +"
라. 의결안건: "+params.get("content5").toString()+""; + + v_ret = v_ret + this.TableHeader(); + + String[] s_Arr_21 = {"구분","의결 안건","회의 결과"}; + v_ret = v_ret +this.makeTrTd(s_Arr_21); + String[] s_Arr_22 = {"보고사항", params.get("content6").toString(), params.get("content7").toString()}; + v_ret = v_ret +this.makeTrTd(s_Arr_22); + + v_ret = v_ret + this.TableFooter(); + + v_ret = v_ret +"

붙임 "+p_dataA.get("conferenceNames").toString()+" 회의결과보고 1부. 끝."; + + + + /* * //보완요구2차 || "1-9".equals(p_jobID) //공정거래 - 0201000000 @@ -3285,6 +3435,12 @@ v_ret = this.receiverHeader(); return v_ret; } + private EgovMap chgURLDecoder(EgovMap p_params, String p_content) throws Exception { + p_params.put(p_content, URLDecoder.decode((String)p_params.get(p_content), "UTF-8")); + + return p_params; + } + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // 3.단순 문구 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 72690f47..9e5896a0 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 @@ -1991,7 +1991,7 @@ function nanumCall(no, nanumSubject){ //문서 기안작성 및 결제상신 -function nanumApi_back(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, +function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){ if(jobID != '')$("#jobID").val(jobID); if(codeNo != '')$("#codeNo").val(codeNo); @@ -2117,7 +2117,7 @@ function nanumApi_back(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, } //문서 기안작성 및 결제상신 -function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, +function nanumApi_back(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){ if(jobID != '')$("#jobID").val(jobID); if(codeNo != '')$("#codeNo").val(codeNo); diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp index ef1e819a..c5bf5501 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp @@ -1767,6 +1767,8 @@ function nanumCall(no, nanumSubject){ } + alert(jobID); + nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15); }); } @@ -2544,6 +2546,120 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, if(jobID != '')$("#jobID").val(jobID); if(codeNo != '')$("#codeNo").val(codeNo); if(nanumSubject != '')$("#nanumSubject").val(encodeURIComponent(nanumSubject)); + if(obj1 != '')$("#content1").val(encodeURIComponent(obj1)); + if(obj2 != '')$("#content2").val(encodeURIComponent(obj2)); + if(obj3 != '')$("#content3").val(encodeURIComponent(obj3)); + if(obj4 != '')$("#content4").val(encodeURIComponent(obj4)); + if(obj5 != '')$("#content5").val(encodeURIComponent(obj5)); + if(obj6 != '')$("#content6").val(encodeURIComponent(obj6)); + if(obj7 != '')$("#content7").val(encodeURIComponent(obj7)); + if(obj8 != '')$("#content8").val(encodeURIComponent(obj8)); + if(obj9 != '')$("#content9").val(encodeURIComponent(obj9)); + if(obj10 != '')$("#content10").val(encodeURIComponent(obj10)); + if(obj11 != '')$("#content11").val(encodeURIComponent(obj11)); + if(obj12 != '')$("#content12").val(encodeURIComponent(obj12)); + if(obj13 != '')$("#content13").val(encodeURIComponent(obj13)); + if(obj14 != '')$("#content14").val(encodeURIComponent(obj14)); + if(obj15 != '')$("#content15").val(encodeURIComponent(obj15)); + + var url = ""; + $("#typeNanum").val("S"); + $("#nanumFrmCaseNo").val($("#cfrncNo").val()); + var param = jQuery('#nanumFrm').serialize(); + //url = "/gtm/case/nanum/ajax/SanctnhistoryCnt.do"; + url = "/gtm/case/nanum/ajax/SanctnhistoryCntNew.do"; + XHR(url, param, function(r){ + if(r.data.sanctnhistoryCnt == 0){ + + if(codeNo != ""){ + if(codeNo == '5223000000' || codeNo == '5323000000' || codeNo == '5430000000' || + codeNo == '5523000000' || codeNo == '5223000000' || codeNo == '5623000000' || codeNo == '5823000000' + ){ + if(!confirm("변경한 데이터가 있다면 등록후 회의결과 보고를 해주세요. 등록 하셨습니까?")){ + location.reload(); + return false; + } + } + } + + if(confirm("등록된 결재정보가 없습니다. 등록하시겠습니까?")){ + /* + var url = ""; + $("#typeNanum").val("I"); + $("#nanumCaseGubun").val($("#caseGubun").val()); + var param = jQuery('#nanumFrm').serialize(); + url = "/gtm/case/nanum/ajax/SanctnhistoryIns.do"; + */ + + var url = ""; + $("#typeNanum").val("I"); + //$("#nanumCaseGubun").val('${masterData.caseGubun}'); + $("#nanumCaseGubun").val($("#caseGubun").val()); + var param = jQuery('#nanumFrm').serialize(); + url = "/gtm/case/ajax/SanctnhistoryInsNew.do"; + + XHR(url, param, function(r){ + + $("#nanumViewFrm #compSeqView").val('1000'); + $("#nanumViewFrm #approKeyView").val(r.data2.docId); + //$("#approKeyView").val('H20241120063050'); + + //$("#docIdImsi").val(r.data.docId); + $("#nanumViewFrm #formIdView").val('336'); + $("#nanumViewFrm #modView").val('w'); //작성 고정 + + //$("#approKeyImsi").val(r.data2.docId); //외부시스템 연동키 외부시스템 연동키 + $("#nanumViewFrm #loginIdView").val('test04'); //그룹웨어로그인아이디 + $("#nanumViewFrm #loginIdView").val('admin'); //그룹웨어로그인아이디 + + $("#nanumViewFrm #subjectStrView").val(r.title); //그룹웨어로그인아이디 + $("#nanumViewFrm #contentsStrView").val(r.contents); + + //$("#subjectStrImsi").val(r.title); //그룹웨어로그인아이디 + //$("#contentsStrImsi").val(r.contents); //그룹웨어로그인아이디 + + var f = document.nanumViewFrm; + f.action = $("#nanumViewFrm #gwCallUrlView").val(); + f.target = "_blank"; + f.submit(); + + location.reload(); + + /* + $("#docID").val(r.selectKey.docId); + var url = ""; + $("#typeNanum").val("NANUM"); + var param = jQuery('#nanumFrm').serialize(); + url = "/gtm/case/common/ajax/NANUM.do"; + XHR(url, param, function(r){ + if(r.nanumCall.ndata.code == '0'){ + $("#doc").val($("#docID").val()); + var f = document.nanumFrm; + f.target = "blank"; + f.action = $("#callProcessUrl").val(); + f.submit(); + }else { + alert(r.nanumCall.ndata.message +" || "+ r.nanumCall.ndata.status +" || "+ r.nanumCall.ndata.code); + return false; + } + }); + */ + }); + } + }else{ + //기존에 입력된 연계데이터가 있을 경우 + if(confirm("등록된 결재정보가 있습니다. 열람하시겠습니까?")){ + nanumProcessCall(codeNo); + } + } + }); +} + +function nanumApi_back(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, + obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){ + if(jobID != '')$("#jobID").val(jobID); + if(codeNo != '')$("#codeNo").val(codeNo); + if(nanumSubject != '')$("#nanumSubject").val(encodeURIComponent(nanumSubject)); if(obj1 != '')$("#content1").val(encodeURIComponent(obj1)); if(obj2 != '')$("#content2").val(encodeURIComponent(obj2)); if(obj3 != '')$("#content3").val(encodeURIComponent(obj3)); @@ -2614,9 +2730,59 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, }); } - //결재진행중인 문서 호출 function nanumProcessCall(codeNo){ + /* + 화면 로딩 시 nanumFrmCaseNo 에 문서번호(RCEPT_NO) 혹은 + 사건번호(CASE_NO) 혹은 협의회일련번호(CFRNC_NO) 값을 넣어준 후 호출해야 함. + */ + var url = ""; + $("#typeNanum").val("S"); + $("#nanumFrmCaseNo").val($("#cfrncNo").val()); + $("#codeNo").val(codeNo); + var param = jQuery('#nanumFrm').serialize(); + url = "/gtm/case/nanum/ajax/SanctnhistorySelDesc.do"; + XHR(url, param, function(r){ + /* + $("#doc").val(r.data.docId); + $("#docID").val(r.data.docId); + var f = document.nanumFrm; + f.target = "blank"; + if(r.data.resultData == 'NODATA'){ + f.action = $("#callProcessUrl").val(); + }else{ + var f = document.nanumFrm; + f.action = $("#nanumProcessUrl").val(); + } + f.submit(); + */ + + $("#compSeqView").val('1000'); + $("#approKeyView").val(r.data.docId); + //$("#approKeyView").val('H20241120063050'); + + //$("#docIdImsi").val(r.data.docId); + $("#formIdView").val('336'); + $("#modView").val('v'); //작성 고정 + + //$("#approKeyImsi").val(r.data2.docId); //외부시스템 연동키 외부시스템 연동키 + $("#loginIdView").val('test04'); //그룹웨어로그인아이디 + $("#loginIdView").val('admin'); //그룹웨어로그인아이디 + + //$("#subjectStrImsi").val(r.title); //그룹웨어로그인아이디 + //$("#contentsStrImsi").val(r.contents); //그룹웨어로그인아이디 + + var f = document.nanumViewFrm; + f.action = $("#gwCallUrlView").val(); + f.target = "_blank"; + f.submit(); + + }); + +} + + +function nanumProcessCall_back(codeNo){ /* 화면 로딩 시 nanumFrmCaseNo 에 문서번호(RCEPT_NO) 혹은 사건번호(CASE_NO) 혹은 협의회일련번호(CFRNC_NO) 값을 넣어준 후 호출해야 함. @@ -2643,9 +2809,6 @@ function nanumProcessCall(codeNo){ } - - - //이전결재 보기용. function nanumCall2(no, nanumSubject, directCaseNo){ nanumSubject = $("#conferenceNames").val()+' '+nanumSubject; @@ -3232,6 +3395,7 @@ function nanumHisDel(){ url = "/gtm/case/nanum/ajax/RetrunHisDel2.do"; XHR2(url, param, function(r){ alert("기안문이 삭제 되었습니다."); + location.reload(); }); } @@ -3968,4 +4132,38 @@ function nanumHisDel(){
- \ No newline at end of file + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +