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

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Browse Source
This commit is contained in:
myname 2025-04-25 11:18:13 +09:00
commit 743de14345
7 changed files with 233 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml
View File

@ -878,6 +878,8 @@
A.CASE_NO,
CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
A.OFFICE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.OFFICE_GUBUN AND ROWNUM = 1) AS OFFICE_GUBUN_NM,
STATE_PRO,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO) AS STATE_PRO_NM,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO), '접수', '통지', '통지', '조사', '조사', '보고', '보고', '종료통지', '종료통지', '-') AS STATE_PRO_NEXT,
@ -901,6 +903,9 @@
WHERE
TRANSFER_CHECK = 'N'
AND A.CASE_NO = D.CASE_NO
<if test="officeGubun2 != null and officeGubun2 != ''">
AND A.OFFICE_GUBUN = #{officeGubun2}
</if>
ORDER BY A.CASE_NO DESC
</select>
@ -910,6 +915,8 @@
A.CASE_NO,
CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
A.OFFICE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.OFFICE_GUBUN AND ROWNUM = 1) AS OFFICE_GUBUN_NM,
STATE_PRO,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO) AS STATE_PRO_NM,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO), '접수', '통지', '통지', '조사', '조사', '보고', '보고', '종료통지', '종료통지', '-') AS STATE_PRO_NEXT,
@ -935,6 +942,9 @@
<!-- AND A.MEDIATION_BIG IN ('0616010000')
AND A.MEDIATION_SMALL IN ('0616000000') -->
AND A.CASE_NO = B.CASE_NO
<if test="officeGubun2 != null and officeGubun2 != ''">
AND A.OFFICE_GUBUN = #{officeGubun2}
</if>
ORDER BY CASE_NO DESC
</select>
@ -944,6 +954,8 @@
A.CASE_NO,
CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
A.OFFICE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.OFFICE_GUBUN AND ROWNUM = 1) AS OFFICE_GUBUN_NM,
STATE_PRO,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO) AS STATE_PRO_NM,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO), '접수', '통지', '통지', '조사', '조사', '보고', '보고', '종료통지', '종료통지', '-') AS STATE_PRO_NEXT,
@ -964,6 +976,9 @@
WHERE
TRANSFER_CHECK = 'N'
AND A.CASE_NO = D.CASE_NO
<if test="officeGubun2 != null and officeGubun2 != ''">
AND A.OFFICE_GUBUN = #{officeGubun2}
</if>
ORDER BY A.CASE_NO DESC
</select>

40
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp
View File

@ -49,6 +49,7 @@ $(document).ready(function(){
loadFileData10();
loadCfrncexpensData();
nanumHisDelSel();
officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@ -57,6 +58,10 @@ $(document).ready(function(){
fileList();
});
//협의회관리 협의회일련번호 미리 따놓기
$("#officeGubun2").change(function(){
loadSimData();
});
});
var conferenceNames ="";
@ -153,6 +158,7 @@ function loadSimData(){
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+v.officeGubunNm+'</td>';
html += '</tr>';
list.push(v.caseNo);
@ -165,7 +171,7 @@ function loadSimData(){
}else{
html += '<tr>';
html += '<td colspan="7">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="8">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
$("#sim").html(html);
}
@ -825,6 +831,20 @@ function caseGubunCombo(){
});
}
//사무실구분
function officeGubunCombo(){
var url = "";
$("#type").val("L");
var param = jQuery('#frm').serialize();
url = "/gtm/case/common/ajax/Institution.do";
XHR2(url, param, function(r){
$("#officeGubun2").append('<option value="">전체</option>');
var objList = $("#officeGubun2");
var sel = "";
ajaxCombo(r.data, objList, sel);
});
}
//회의명 생성
/* function caseConferenceNames(){
var url = "";
@ -2142,7 +2162,16 @@ function nanumCallGeneral(p_jobID, nanumSubject){
<table>
<thead>
<tr>
<th colspan="7">심의안건 상정</th>
<th colspan="8">
<div style="width: 210px; float: left;">
&nbsp;
</div>
심의안건 상정
<div style="width: 210px; float: right;">
<select name="officeGubun2" id="officeGubun2" class="form-element">
</select>
</div>
</th>
</tr>
<tr>
<th>순번</th>
@ -2152,16 +2181,19 @@ function nanumCallGeneral(p_jobID, nanumSubject){
<th>조정결과(대분류)</th>
<th>조정결과(소분류)</th>
<th>담당자</th>
<th>담당</th>
</tr>
</thead>
<tbody id="sim">
<tr>
<td colspan="7">선택된 심의안건이 없습니다.</td>
<td colspan="8">
선택된 심의안건이 없습니다.
</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="7">
<td colspan="8">
<!-- <button type="button" class="btn-default fr" id="simAdd">추가</button> -->
</td>
</tr>

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

@ -51,6 +51,7 @@ $(document).ready(function(){
loadFileData9();
loadFileData10();
loadCfrncexpensData();
officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@ -58,6 +59,10 @@ $(document).ready(function(){
fileList();
});
$("#officeGubun2").change(function(){
loadSimData();
});
//협의회관리 협의회일련번호 미리 따놓기
});
@ -143,6 +148,7 @@ function loadSimData(){
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+v.officeGubunNm+'</td>';
html += '</tr>';
list.push(v.caseNo);
@ -154,7 +160,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '<tr>';
html += '<td colspan="7">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="8">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
$("#sim").html(html);
}
@ -764,6 +770,20 @@ function caseGubunCombo(){
});
}
//사무실구분
function officeGubunCombo(){
var url = "";
$("#type").val("L");
var param = jQuery('#frm').serialize();
url = "/gtm/case/common/ajax/Institution.do";
XHR2(url, param, function(r){
$("#officeGubun2").append('<option value="">전체</option>');
var objList = $("#officeGubun2");
var sel = "";
ajaxCombo(r.data, objList, sel);
});
}
//회의안건 등록
function regData(){
//수정된 파일 메모 저장
@ -1617,7 +1637,18 @@ function nanumCallGeneral(p_jobID, nanumSubject){
<table>
<thead>
<tr>
<th colspan="7">심의안건 상정 &nbsp; <button type="button" class="btn-default btn btn_30 btn_text green_border" id="conference01" onclick="clipCall('conference01');">엑셀</button></th>
<th colspan="8">
<div style="width: 210px; float: left;">
&nbsp;
</div>
심의안건 상정 &nbsp; <button type="button" class="btn-default btn btn_30 btn_text green_border" id="conference01" onclick="clipCall('conference01');">엑셀</button>
<div style="width: 210px; float: right;">
<select name="officeGubun2" id="officeGubun2" class="form-element">
</select>
</div>
</th>
</tr>
<tr>
<th>순번</th>
@ -1627,16 +1658,17 @@ function nanumCallGeneral(p_jobID, nanumSubject){
<th>조정결과(대분류)</th>
<th>조정결과(소분류)</th>
<th>담당자</th>
<th>담당</th>
</tr>
</thead>
<tbody id="sim">
<tr>
<td colspan="7">선택된 심의안건이 없습니다.</td>
<td colspan="8">선택된 심의안건이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="7">
<td colspan="8">
<!-- <button type="button" class="btn-default fr" id="simAdd">추가</button> -->
</td>
</tr>

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

@ -41,12 +41,17 @@ $(document).ready(function(){
loadJosuData();
loadChamData();
loadFileData();
officeGubunCombo(); //사무실구분
//loadFileData2();
//loadFileData3();
//loadFileData4();
//loadCfrncexpensData();
//loadFileData11();
}, 0);
$("#officeGubun2").change(function(){
loadSimData();
});
$("#simAllcheck").click(function(){
var checkArr = $("input:checkbox[name=simCheck]");
@ -208,6 +213,7 @@ function loadSimData(){
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+v.officeGubunNm+'</td>';
html += '<td><button type="button" class="btn btn_text btn_30 orange_border btn-default" onclick="changeReqCase(\''+v.caseNo+'\');nanumCall(\'3\', \'출석요구\');">분쟁조정협의회 출석요구</button></td>';
html += '</tr>';
list.push(v.caseNo);
@ -218,7 +224,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '<tr>';
html += '<td colspan="9">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="10">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
$("#sim").html(html);
}
@ -791,7 +797,7 @@ function setData(parentId){
html += '</tr>';
}else if(parentId == 'sim'){
html += '<tr>';
html += '<td colspan="9">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="10">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
}else if(parentId == 'josu'){
html += '<tr>';
@ -834,6 +840,20 @@ function caseGubunCombo(){
});
}
//사무실구분
function officeGubunCombo(){
var url = "";
$("#type").val("L");
var param = jQuery('#frm').serialize();
url = "/gtm/case/common/ajax/Institution.do";
XHR2(url, param, function(r){
$("#officeGubun2").append('<option value="">전체</option>');
var objList = $("#officeGubun2");
var sel = "";
ajaxCombo(r.data, objList, sel);
});
}
//회의명 생성
/* function caseConferenceNames(){
var url = "";
@ -3407,17 +3427,27 @@ function nanumApiView(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
<colgroup>
<col style="width:80px;">
<col style="width:80px;">
<col style="width:13%;">
<col style="width:12%;">
<col style="width:12%;">
<col style="width:12%;">
<col style="width:12%;">
<col style="width:12%;">
<col style="width:10%;">
<col style="width:10%;">
<col style="width:10%;">
<col style="width:10%;">
<col style="width:10%;">
<col style="width:10%;">
<col style="width:10%;">
<col style="width:auto;">
</colgroup>
<thead>
<tr>
<th colspan="9">심의안건 상정</th>
<th colspan="10">
<div style="width: 210px; float: left;">
&nbsp;
</div>
심의안건 상정
<div style="width: 210px; float: right;">
<select name="officeGubun2" id="officeGubun2" class="form-element">
</select>
</div>
</th>
</tr>
<tr>
<th><input type="checkbox" id="simAllcheck"></th>
@ -3428,17 +3458,18 @@ function nanumApiView(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
<th>조정결과(대분류)</th>
<th>조정결과(소분류)</th>
<th>담당자</th>
<th>담당</th>
<th style="width: 200px;">출석요구</th>
</tr>
</thead>
<tbody id="sim">
<tr>
<td colspan="9">선택된 심의안건이 없습니다.</td>
<td colspan="10">선택된 심의안건이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="9">
<td colspan="10">
<div class="btn_wrap right mt5 mb5">
<button type="button" class="btn-default btn btn_text btn_30 blue_border" id="simAdd">추가</button>
<button type="button" class="btn-default btn btn_text btn_30 red_border" id="chamDel" onclick="chamDelFunc();">삭제</button>

38
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp
View File

@ -43,6 +43,7 @@ $(document).ready(function(){
loadJosuData();
loadChamData();
loadFileData();
officeGubunCombo(); //사무실구분
//loadFileData2();
//loadFileData3();
//loadFileData4();
@ -54,6 +55,10 @@ $(document).ready(function(){
fileList();
});
$("#officeGubun2").change(function(){
loadSimData();
});
$("#simAdd, #bogoAdd, #chamAdd, #josuAdd").click(function(){
var conferenceGubun = $("#conferenceGubun").val();
if(conferenceGubun.length == 0 && this.id == 'chamAdd'){
@ -172,6 +177,7 @@ function loadSimData(){
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+v.officeGubunNm+'</td>';
html += '</tr>';
list.push(v.caseNo);
});
@ -179,7 +185,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '<tr>';
html += '<td colspan="7">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="8">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
$("#sim").html(html);
}
@ -574,6 +580,20 @@ function caseGubunCombo(){
});
}
//사무실구분
function officeGubunCombo(){
var url = "";
$("#type").val("L");
var param = jQuery('#frm').serialize();
url = "/gtm/case/common/ajax/Institution.do";
XHR2(url, param, function(r){
$("#officeGubun2").append('<option value="">전체</option>');
var objList = $("#officeGubun2");
var sel = "";
ajaxCombo(r.data, objList, sel);
});
}
//회의자료 등록
function regData(){
//기본정보 입력
@ -1290,7 +1310,16 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
<table>
<thead>
<tr>
<th colspan="7">심의안건 상정</th>
<th colspan="8">
<div style="width: 210px; float: left;">
&nbsp;
</div>
심의안건 상정
<div style="width: 210px; float: right;">
<select name="officeGubun2" id="officeGubun2" class="form-element">
</select>
</div>
</th>
</tr>
<tr>
<th>순번</th>
@ -1300,16 +1329,17 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
<th>조정결과(대분류)</th>
<th>조정결과(소분류)</th>
<th>담당자</th>
<th>담당</th>
</tr>
</thead>
<tbody id="sim">
<tr>
<td colspan="7">선택된 심의안건이 없습니다.</td>
<td colspan="8">선택된 심의안건이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="7">
<td colspan="8">
<!-- <button type="button" class="btn-default fr" id="simAdd">추가</button> -->
</td>
</tr>

41
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
View File

@ -42,6 +42,7 @@ $(document).ready(function(){
loadFileData4();
loadCfrncexpensData();
nanumHisDelSel();
officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@ -50,6 +51,10 @@ $(document).ready(function(){
fileList();
});
$("#officeGubun2").change(function(){
loadSimData();
});
$("#simAdd, #bogoAdd, #chamAdd, #josuAdd").click(function(){
var conferenceGubun = $("#conferenceGubun").val();
if(conferenceGubun.length == 0 && this.id == 'chamAdd'){
@ -178,6 +183,7 @@ function loadSimData(){
html += '<td><select name="mediationBigSim'+k+'" id="mediationBigSim'+k+'" disabled="disabled"><option value="">대분류 선택</option></select></td>';
html += '<td><select name="mediationSmallSim'+k+'" id="mediationSmallSim'+k+'" onchange="mediationSmallChangeSim('+k+');"><option value="">소분류 선택</option></select></td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+v.officeGubunNm+'</td>';
html += '<td>'+'<input type="checkbox" name="simModConfirm" value="'+v.caseNo+'"'+isCheck+'>'+'</td>';
html += '</tr>';
simlist.push(v.caseNo);
@ -197,7 +203,7 @@ function loadSimData(){
$("#arrListsim").val(simlist);
}else{
html += '<tr>';
html += '<td colspan="8">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="9">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
$("#sim").html(html);
}
@ -755,7 +761,7 @@ function setData(parentId){
html += '</tr>';
}else if(parentId == 'sim'){
html += '<tr>';
html += '<td colspan="7">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="9">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
}
$("#"+parentId).html(html);
@ -795,6 +801,20 @@ function caseGubunCombo(){
});
}
//사무실구분
function officeGubunCombo(){
var url = "";
$("#type").val("L");
var param = jQuery('#frm').serialize();
url = "/gtm/case/common/ajax/Institution.do";
XHR2(url, param, function(r){
$("#officeGubun2").append('<option value="">전체</option>');
var objList = $("#officeGubun2");
var sel = "";
ajaxCombo(r.data, objList, sel);
});
}
//회의명 생성
/* function caseConferenceNames(){
var url = "";
@ -3807,11 +3827,21 @@ function nanumHisDel(){
</tbody>
</table>
</div>
<div class="table-layout border inp-scroll no-gradient no-hover mt20">
<table>
<thead>
<tr>
<th colspan="8">심의안건 상정</th>
<th colspan="9">
<div style="width: 210px; float: left;">
&nbsp;
</div>
심의안건 상정
<div style="width: 210px; float: right;">
<select name="officeGubun2" id="officeGubun2" class="form-element">
</select>
</div>
</th>
</tr>
<tr>
<th>순번</th>
@ -3821,17 +3851,18 @@ function nanumHisDel(){
<th>조정결과(대분류)</th>
<th>조정결과(소분류)</th>
<th>담당자</th>
<th>담당</th>
<th style="width: 20px">수정의결</th>
</tr>
</thead>
<tbody id="sim">
<tr>
<td colspan="8">선택된 심의안건이 없습니다.</td>
<td colspan="9">선택된 심의안건이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="8">
<td colspan="9">
<!-- <button type="button" class="btn-default fr" id="simAdd">추가</button> -->
</td>
</tr>

38
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportView.jsp
View File

@ -40,6 +40,7 @@ $(document).ready(function(){
loadFileData3();
loadFileData4();
loadCfrncexpensData();
officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@ -47,6 +48,10 @@ $(document).ready(function(){
fileList();
});
$("#officeGubun2").change(function(){
loadSimData();
});
$("#simAdd, #bogoAdd, #chamAdd, #josuAdd").click(function(){
var conferenceGubun = $("#conferenceGubun").val();
if(conferenceGubun.length == 0 && this.id == 'chamAdd'){
@ -166,6 +171,7 @@ function loadSimData(){
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+v.officeGubunNm+'</td>';
html += '</tr>';
list.push(v.caseNo);
});
@ -173,7 +179,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '<tr>';
html += '<td colspan="7">선택된 심의안건이 없습니다.</td>';
html += '<td colspan="8">선택된 심의안건이 없습니다.</td>';
html += '</tr>';
$("#sim").html(html);
}
@ -581,6 +587,20 @@ function caseGubunCombo(){
});
}
//사무실구분
function officeGubunCombo(){
var url = "";
$("#type").val("L");
var param = jQuery('#frm').serialize();
url = "/gtm/case/common/ajax/Institution.do";
XHR2(url, param, function(r){
$("#officeGubun2").append('<option value="">전체</option>');
var objList = $("#officeGubun2");
var sel = "";
ajaxCombo(r.data, objList, sel);
});
}
//회의안건 등록
function regData(){
if($('input[name=uploadFileName]').size() != 0){
@ -792,7 +812,16 @@ function resultGo(){
<table>
<thead>
<tr>
<th colspan="7">심의안건 상정</th>
<th colspan="8">
<div style="width: 210px; float: left;">
&nbsp;
</div>
심의안건 상정
<div style="width: 210px; float: right;">
<select name="officeGubun2" id="officeGubun2" class="form-element">
</select>
</div>
</th>
</tr>
<tr>
<th>순번</th>
@ -802,16 +831,17 @@ function resultGo(){
<th>조정결과(대분류)</th>
<th>조정결과(소분류)</th>
<th>담당자</th>
<th>담당</th>
</tr>
</thead>
<tbody id="sim">
<tr>
<td colspan="7">선택된 심의안건이 없습니다.</td>
<td colspan="8">선택된 심의안건이 없습니다.</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="7">
<td colspan="8">
<!-- <button type="button" class="btn-default fr" id="simAdd">추가</button> -->
</td>
</tr>