이지우 - 조정결과 내 '기타'일 시 기타 사유 선택 기능 추가

This commit is contained in:
JIWOO 2025-03-27 12:15:40 +09:00
parent 0ae6e2f929
commit 1a7062c69d
13 changed files with 248 additions and 13 deletions

View File

@ -297,6 +297,8 @@
NVL((SELECT RESPONDENT_COMPANY FROM C_CASERESPONDENT C WHERE C.CASE_NO = A.CASE_NO AND ROWNUM = 1), '-') AS RESPONDENT_COMPANY,
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '-') AS MEDIATION_BIG,
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_SMALL), '-') AS MEDIATION_SMALL,
MEDIATION_SMALL AS MEDIATION_SMALL_CODE,
MEDIATION_ETC_DETAIL,
TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE,
(SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '성립', 1, '불성립', 2, '중지', 3, '심의', 1) AS BIG_ORDER
@ -528,6 +530,12 @@
UPDATE C_MASTER SET
MEDIATION_BIG = #{mediationBig}
, MEDIATION_SMALL = #{mediationSmall}
<if test="mediationETCDetail != null and mediationETCDetail != ''">
,MEDIATION_ETC_DETAIL = #{mediationETCDetail}
</if>
<if test="mediationETCDetail == null or mediationETCDetail == ''">
,MEDIATION_ETC_DETAIL = NULL
</if>
WHERE CASE_NO = #{caseNo}
</update>
@ -1002,6 +1010,7 @@
NVL(MEDIATION_BIG, '-') AS MEDIATION_BIG_CODE,
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_SMALL), '-') AS MEDIATION_SMALL,
NVL(MEDIATION_SMALL, '-') AS MEDIATION_SMALL_CODE,
MEDIATION_ETC_DETAIL,
TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE,
(SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER
FROM C_MASTER A
@ -1035,6 +1044,7 @@
NVL(B.MEDIATION_BIG, '-') AS MEDIATION_BIG_CODE,
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = B.MEDIATION_SMALL), '-') AS MEDIATION_SMALL,
NVL(B.MEDIATION_SMALL, '-') AS MEDIATION_SMALL_CODE,
MEDIATION_ETC_DETAIL,
TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE,
(SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER,
MOD_RESOLUTION
@ -1403,6 +1413,8 @@
NVL((SELECT RESPONDENT_COMPANY FROM C_CASERESPONDENT C WHERE C.CASE_NO = A.CASE_NO AND ROWNUM = 1), '-') AS RESPONDENT_COMPANY,
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '-') AS MEDIATION_BIG,
NVL((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_SMALL), '-') AS MEDIATION_SMALL,
MEDIATION_SMALL AS MEDIATION_SMALL_CODE,
MEDIATION_ETC_DETAIL,
TO_CHAR(CASE_DATE, 'YYYYMMDD') AS CASE_DATE,
(SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CASE_EXAMINER) AS CASE_EXAMINER,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = MEDIATION_BIG), '성립', 1, '불성립', 2, '중지', 3, '심의', 1) AS BIG_ORDER,

View File

@ -413,6 +413,7 @@
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CM.MEDIATION_BIG) AS MEDIATION_BIG_NAME,
CM.MEDIATION_SMALL,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CM.MEDIATION_SMALL) AS MEDIATION_SMALL_NAME,
CM.MEDIATION_ETC_DETAIL,
CM.AGREEMENT_FILE,
CM.WITHDRAWAL_FILE,
CM.CON_PROTOCOL_FILE,

View File

@ -1755,6 +1755,7 @@
CM.PENDENCY_PERIOD,
CM.MEDIATION_BIG,
CM.MEDIATION_SMALL,
CM.MEDIATION_ETC_DETAIL,
CM.AGREEMENT_FILE,
CM.WITHDRAWAL_FILE,
CM.CON_PROTOCOL_FILE,
@ -3082,6 +3083,12 @@
SET
MEDIATION_BIG = #{mediationBig, jdbcType=VARCHAR},
MEDIATION_SMALL = #{mediationSmall, jdbcType=VARCHAR},
<if test="mediationETCDetail != null and mediationETCDetail != ''">
MEDIATION_ETC_DETAIL = #{mediationETCDetail, jdbcType=VARCHAR},
</if>
<if test="mediationETCDetail == null or mediationETCDetail == ''">
MEDIATION_ETC_DETAIL = NULL,
</if>
MEDIATION_REQ_AMOUNT = #{mediationReqAmount, jdbcType=INTEGER},
MEDIATION_AMOUNT = #{mediationAmount, jdbcType=INTEGER},
RESPONDENT_AMOUNT = #{respondentAmount, jdbcType=INTEGER},

View File

@ -183,6 +183,23 @@ function loadBogoData(){
var list = new Array();
if(r.data.length != 0){
$.each(r.data, function(k,v) {
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
cnt++;
html += '<tr>';
@ -202,7 +219,7 @@ function loadBogoData(){
}
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '</tr>';
list.push(v.caseNo);

View File

@ -172,6 +172,24 @@ function loadBogoData(){
var list = new Array();
if(r.data.length != 0){
$.each(r.data, function(k,v) {
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
cnt++;
html += '<tr>';
html += '<td>'+(Number(k)+1)+'</td>';
@ -190,7 +208,7 @@ function loadBogoData(){
}
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '</tr>';
list.push(v.caseNo);

View File

@ -236,6 +236,25 @@ function loadBogoData(){
var list = new Array();
if(r.data.length != 0){
$.each(r.data, function(k,v) {
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
cnt++;
html += '<tr>';
html += '<td><input type="checkbox" id="bogoCheck" name="bogoCheck" value="'+v.caseNo+'"></td>';
@ -255,7 +274,7 @@ function loadBogoData(){
}
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '</tr>';
list.push(v.caseNo);
@ -696,6 +715,25 @@ function setData(parentId){
lists += coms + v.memberNo;
idxs ++;
}else{
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
//심의안건, 보고안건, 조정조서
html += '<td></td>';
html += '<td>'+cnt+'</td>';
@ -717,7 +755,7 @@ function setData(parentId){
html += '<td>'+v.respondentCeo+'</td>';
*/
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
if(parentId == 'sim') {

View File

@ -197,6 +197,24 @@ function loadBogoData(){
var list = new Array();
if(r.data.length != 0){
$.each(r.data, function(k,v) {
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
cnt++;
html += '<tr>';
html += '<td>'+(Number(k)+1)+'</td>';
@ -215,7 +233,7 @@ function loadBogoData(){
}
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '</tr>';
list.push(v.caseNo);

View File

@ -166,6 +166,24 @@ function setData(parentId){
lists += coms + v.memberNo;
idxs ++;
}else{
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
//심의안건, 보고안건, 조정조서
html += '<td>'+cnt+'</td>';
html += '<td>'+v.caseNo+'</td>';
@ -180,7 +198,7 @@ function setData(parentId){
html += '<td>'+v.respondentCompany+'</td>';
}
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
}
html += '</tr>';

View File

@ -155,6 +155,25 @@
html += '<td>'+v.memberPosit+'</td>';
html += '<td>'+v.memberUnit+'</td>';
}else{
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
//심의안건, 보고안건
html += '<td><input type="checkbox" id="chk'+ k +'" name="chk" value="'+v.caseNo+'"/></td>';
html += '<td>'+cnt+'</td>';
@ -162,7 +181,7 @@
html += '<td>'+v.applcntCompany+'</td>';
html += '<td>'+v.respondentCompany+'</td>';
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
}
html += '</tr>';

View File

@ -235,6 +235,7 @@ function loadBogoData(){
html += '<td><select name="mediationBig'+k+'" id="mediationBig'+k+'" disabled="disabled"><option value="">대분류 선택</option></select></td>';
html += '<td><select name="mediationSmall'+k+'" id="mediationSmall'+k+'" onchange="mediationSmallChange('+k+');"><option value="">소분류 선택</option></select></td>';
html += '<td><select name="mediationETCDetail'+k+'" id="mediationETCDetail'+k+'" style="display:none;" ><option value="A">타 기관 중복 신청</option><option value="B">종료사건 재신청</option><option value="C">연락 두절</option><option value="D">공정거래위원회 이송 요구</option></select></td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '<td>'+'<input type="checkbox" name="bogoModConfirm" value="'+v.caseNo+'"'+isCheck+'>'+'</td>';
html += '</tr>';
@ -243,12 +244,17 @@ function loadBogoData(){
$("#bogo").append(html);
mediationSmall(k, v.mediationSmallCode);
mediationBig(k, v.mediationBigCode);
if(v.mediationSmallCode == '0633000000'){
$("#mediationETCDetail"+k).val(v.mediationEtcDetail);
$("#mediationETCDetail"+k).show();
}
});
$("#arrListbogo").val(bogolist);
//alert($("#arrListbogo").val());
}else{
html += '<tr>';
html += '<td colspan="8">선택된 보고안건이 없습니다.</td>';
html += '<td colspan="9">선택된 보고안건이 없습니다.</td>';
html += '</tr>';
$("#bogo").html(html);
}
@ -313,6 +319,11 @@ function mediationSmallChange(i){
$(bicList[i]).attr("selected", true);
}
}*/
if(smallVal == '0633'){
$("#mediationETCDetail"+i).show();
}else{
$("#mediationETCDetail"+i).hide();
}
}
function mediationSmallChangeSim(i){
var smallVal = $("#mediationSmallSim"+i).val().substring(0,4);
@ -862,6 +873,12 @@ function regData(){
$("#mediationBig").val($("#mediationBig"+i).val());
$("#mediationSmall").val($("#mediationSmall"+i).val());
//기타 사유 등록
$("#mediationETCDetail").val('');
if($("#mediationSmall"+i).val() == '0633000000'){
$("#mediationETCDetail").val($("#mediationETCDetail"+i).val());
}
var url = "";
$("#type").val("U");
var param = jQuery('#frm').serialize();
@ -3585,6 +3602,7 @@ function nanumHisDel(){
<input type="hidden" id="mediationSmallSim" name="mediationSmallSim" value="">
<input type="hidden" id="mediationBig" name="mediationBig" value="">
<input type="hidden" id="mediationSmall" name="mediationSmall" value="">
<input type="hidden" id="mediationETCDetail" name="mediationETCDetail" value="">
<input type="hidden" id="caseNo" name="caseNo" value="">
<input type="hidden" id="fileSeqNo" name="fileSeqNo" value="">
<input type="hidden" id="expenseHistory" name="expenseHistory" value="">
@ -3808,7 +3826,7 @@ function nanumHisDel(){
<table>
<thead>
<tr>
<th colspan="8">보고안건 상정</th>
<th colspan="9">보고안건 상정</th>
</tr>
<tr>
<th>순번</th>
@ -3817,18 +3835,19 @@ function nanumHisDel(){
<th>피신청인</th>
<th>종료사유(대분류)</th>
<th>종료사유(소분류)</th>
<th>기타사유</th>
<th>담당자</th>
<th style="width: 20px">수정의결</th>
</tr>
</thead>
<tbody id="bogo">
<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="bogoAdd">추가</button> -->
</td>
</tr>

View File

@ -191,6 +191,24 @@ function loadBogoData(){
var list = new Array();
if(r.data.length != 0){
$.each(r.data, function(k,v) {
//소분류 기타일 시 기타 사유 텍스트 추가
var mediationSmall = v.mediationSmall;
var mediationSmallCode = v.mediationSmallCode;
var etcDetail = "";
if(v.mediationEtcDetail == 'A'){
etcDetail = "(타 기관 중복 신청)";
} else if(v.mediationEtcDetail == 'B'){
etcDetail = "(종료사건 재신청)";
} else if(v.mediationEtcDetail == 'C'){
etcDetail = "(연락 두절)";
} else if(v.mediationEtcDetail == 'D'){
etcDetail = "(공정거래위원회 이송 요구)";
}
if(mediationSmallCode == '0633000000'){
mediationSmall = mediationSmall + etcDetail;
}
cnt++;
html += '<tr>';
html += '<td>'+(Number(k)+1)+'</td>';
@ -209,7 +227,7 @@ function loadBogoData(){
}
html += '<td>'+v.mediationBig+'</td>';
html += '<td>'+v.mediationSmall+'</td>';
html += '<td>'+mediationSmall+'</td>';
html += '<td>'+v.caseExaminer+'</td>';
html += '</tr>';
list.push(v.caseNo);

View File

@ -1311,7 +1311,25 @@ function docOpen(){
<div class="bbs-view-item">
<p class="item-title no-bullet">조정결과</p>
<div class="item-box">
소분류: <c:out value="${masterData.mediationSmallName}"/><br>
소분류: <c:out value="${masterData.mediationSmallName}"/>
<c:set var="etcDetial" value="" />
<c:if test="${not empty masterData.mediationEtcDetail}">
<c:choose>
<c:when test="${masterData.mediationEtcDetail eq 'A'}">
<c:set var="etcDetial" value="(타 기관 중복 신청)" />
</c:when>
<c:when test="${masterData.mediationEtcDetail eq 'B'}">
<c:set var="etcDetial" value="(종료사건 재신청)" />
</c:when>
<c:when test="${masterData.mediationEtcDetail eq 'C'}">
<c:set var="etcDetial" value="(연락 두절)" />
</c:when>
<c:when test="${masterData.mediationEtcDetail eq 'D'}">
<c:set var="etcDetial" value="(공정거래위원회 이송 요구)" />
</c:when>
</c:choose>
</c:if>
${etcDetial}<br>
대분류: <c:out value="${masterData.mediationBigName}"/>
</div>
</div>

View File

@ -247,6 +247,12 @@ $(document).ready(function(){
}
}
//소분류 기타일 시 기타항목 라디오버튼 노출
if(smallVal == '0633'){
$(".mediationETCDiv").show();
}else{
$(".mediationETCDiv").hide();
}
});
//조정신청내역 종료 단계에서 읽기만
@ -762,6 +768,18 @@ $("#periodCalulation").click(function(){
$("#mediationSmall").attr("disabled",false);
}
//보고 상태 조정결과 소분류 기타일 시 기타 사유 처리
if("${masterData.statePro}" == '0404000000' && $("#mediationSmall").val() == '0633000000'){
if($("input[name='mediationETCDetail']:checked").length == 0){
alert("조정결과 기타 사유를 체크해주세요.");
return false;
}
}else{
//소분류 결과 변경 시 기타 사유 삭제
$("input[name='mediationETCDetail']").prop("checked", false);
}
if($("#mediationBig") != undefined){
$("#mediationBig").attr("readonly",false);
$("#mediationBig").attr("disabled",false);
@ -2836,6 +2854,14 @@ function resnCombo(){
for(var i = 0; i < list.size(); i++){
if(list[i].value == '${masterData.mediationSmall}'){
$(list[i]).attr("selected", true);
//소분류 기타일 시 기타항목 라디오버튼 노출
if(list[i].value == '0633000000'){
$(".mediationETCDiv").show();
var mediationETCDetail = '${masterData.mediationEtcDetail}';
if (mediationETCDetail) {
$("input[name='mediationETCDetail'][value='" + mediationETCDetail + "']").prop("checked", true);
}
}
}
}
//}
@ -5703,6 +5729,12 @@ function docOpen(obj) {
<span style="color: blue;">
* 재심의 진행 : <c:out value="${masterData.reconsiderationYn}"/>
</span>
<span class="mediationETCDiv" style="display:none;">
<input type="radio" name="mediationETCDetail" value="A" id="mediationETCA" /><label for="mediationETCA">타 기관 중복 신청</label>&nbsp;
<input type="radio" name="mediationETCDetail" value="B" id="mediationETCB" /><label for="mediationETCB">종료사건 재신청</label>&nbsp;
<input type="radio" name="mediationETCDetail" value="C" id="mediationETCC" /><label for="mediationETCC">연락 두절</label>&nbsp;
<input type="radio" name="mediationETCDetail" value="D" id="mediationETCD" /><label for="mediationETCD">공정거래위원회 이송 요구</label>&nbsp;
</span>
<p id="mediationAlert" class="cf_text color_red mt10"></p>
</div>
</div>