tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-12-24 16:57 g/w 기안문 수정

Browse Source
This commit is contained in:
myname 2024-12-24 16:57:49 +09:00
parent 524e58feea
commit ed5c1b6e69
6 changed files with 125 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

@ -167,7 +167,8 @@ public class GwBaseController {
try {
//params.put("gwData", JSPUtil.fixNull(service.memberNewOne(params)));
Map<String, Object> tmap = (Map<String, Object>) 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<String, Object> tmap = (Map<String, Object>) 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<String, Object> tmap = (Map<String, Object>) 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_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
@ -710,7 +722,34 @@ public class GwBaseController {
}else if ("3".equals(s_jobID)) //수소법원 통지
{
/*
* 공정거래 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<String, Object> p_tmap) {
//Map<String, Object> tmap = (Map<String, Object>) 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.기존 로직

2
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/edit.jsp
View File

@ -64,12 +64,14 @@
<input type="text" name="joinName" id="joinName" value="${memberInfo.MEMBER_NAME }" style="width: 30%" maxlength="20">
</div>
</div>
<!--
<div class="bbs-view-item">
<p class="item-title"><span style="color: red">*</span> G/W아이디(기안문연동에 필요)</p>
<div class="item-box">
<input type="text" name="gwId" id="gwId" value="${memberInfo.MEMBER_ITEM_F6 }" style="width: 30%" maxlength="20">
</div>
</div>
-->
<div class="bbs-view-item">
<p class="item-title"><span style="color: red">*</span> 생년월일</p>
<div class="item-box input_box">

2
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp
View File

@ -63,12 +63,14 @@
<input type="text" name="joinName" id="joinName" style="width: 30%" maxlength="20">
</div>
</div>
<!--
<div class="bbs-view-item">
<p class="item-title"><span style="color: red">*</span> G/W아이디(기안문연동에 필요)</p>
<div class="item-box">
<input type="text" name="gwId" id="gwId" value="${memberInfo.MEMBER_ITEM_F6 }" style="width: 30%" maxlength="20">
</div>
</div>
-->
<div class="bbs-view-item">
<p class="item-title"><span style="color: red">*</span> 생년월일</p>
<div class="item-box">

2
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp
View File

@ -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";

2
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
View File

@ -2001,7 +2001,7 @@ function nanumCall(no, nanumSubject){
});
}
alert(jobID);
//alert(jobID);
}

34
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -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) {
<c:if test="${masterData.caseGubun == '0201000000' || masterData.caseGubun == '0202000000' || masterData.caseGubun == '0203000000' || masterData.caseGubun == '0206000000'}">
<c:choose>
<c:when test="${memberDept == '1004000000' || memberDept == '1040000000'}">
<button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('6', '분쟁조정 접수사실 통지(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button>
<%-- <button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('6', '분쟁조정 접수사실 통지(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button> --%>
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallGeneral('6', '공정위 접수사실 보고');">공정위 접수통지</button>
</c:when>
<c:when test="${memberDept == '1005000000' || memberDept == '1009000000'}">
<button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('6', '분쟁조정 접수사실 보고(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button>
<%-- <button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('6', '분쟁조정 접수사실 보고(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button> --%>
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallGeneral('6', '공정위 접수사실 보고');">공정위 접수통지</button>
</c:when>
<c:otherwise>
<button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('6', '분쟁조정 접수사실 보고');">공정위 접수통지</button>
<!-- <button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('6', '분쟁조정 접수사실 보고');">공정위 접수통지</button> -->
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallGeneral('6', '공정위 접수사실 보고');">공정위 접수통지</button>
</c:otherwise>
</c:choose>
</c:if>
@ -4746,16 +4751,20 @@ function docOpen(obj) {
<c:if test="${masterData.caseGubun == '0201000000' || masterData.caseGubun == '0202000000' || masterData.caseGubun == '0203000000' || masterData.caseGubun == '0206000000'}">
<c:choose>
<c:when test="${memberDept == '1004000000' || memberDept == '1040000000'}">
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCall('6', '분쟁조정 접수사실 통지(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button>
<%-- <button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCall('6', '분쟁조정 접수사실 통지(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button> --%>
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallGeneral('6', '공정위 접수사실 보고');">공정위 접수통지</button>
</c:when>
<c:when test="${memberDept == '1005000000' || memberDept == '1009000000'}">
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCall('6', '분쟁조정 접수사실 보고(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button>
<%-- <button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCall('6', '분쟁조정 접수사실 보고(<c:out value="${masterData.caseNo }"/>)');">공정위 접수통지</button> --%>
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallGeneral('6', '공정위 접수사실 보고');">공정위 접수통지</button>
</c:when>
<c:otherwise>
<c:if test="${masterData.caseNo == '하도2024-0123'}">
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallTest('6', '분쟁조정 접수사실 통지(<c:out value="${masterData.caseNo }"/>)');">확인 접수통지</button>
</c:if>
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCall('6', '분쟁조정 접수사실 보고');">공정위 접수통지</button>
<!-- <button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCall('6', '분쟁조정 접수사실 보고');">공정위 접수통지</button> -->
<button type="button" class="btn btn_text btn_36 blue_border btn-default" onclick="nanumCallGeneral('6', '공정위 접수사실 보고');">공정위 접수통지</button>
</c:otherwise>
</c:choose>
</c:if>
@ -4882,9 +4891,6 @@ function docOpen(obj) {
</c:when>
</c:choose>
<div class="area_right">
<select name="nanumHisDelSel" id="nanumHisDelSel">
<option value="">선택</option>