From f7117ab401510a9229ce7802ceab92d80bfb1048 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 21 Apr 2025 17:06:15 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=B0=B0?= =?UTF-8?q?=EC=A0=95=20=EC=B2=98=EB=A6=AC=20=EC=8B=9C=20=EA=B1=B0=EB=9E=98?= =?UTF-8?q?=EC=9C=A0=ED=98=95,=20=EC=8B=A0=EC=B2=AD=EC=82=AC=EC=9C=A0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=A7=89=EA=B8=B0=20/=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=20=EC=A2=85=EB=A3=8C=EC=9D=BC,=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=EA=B8=B0=EA=B0=84=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95(1?= =?UTF-8?q?=EC=B0=A8=20=EC=8B=AC=EC=9D=98=20=EC=A2=85=EB=A3=8C=20=EC=82=AC?= =?UTF-8?q?=EA=B1=B4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/uss/ion/cu/service/CaseUtilVO.java | 8 +++++ .../cu/service/Impl/CaseUtilServiceImpl.java | 6 ++-- .../com/uss/ion/cu/CaseUtil_SQL_Oracle.xml | 29 ++++++++++++++----- .../config/mappers/common/common_sql.xml | 15 +++++----- .../trublreqstmng/trublreqstmng_sql.xml | 16 ++++++++++ .../_extra/gtm/trublcfrncmng/reportEdit.jsp | 14 ++++++--- .../_extra/gtm/trublreqstmng/administView.jsp | 26 ++++++++++------- 7 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/main/java/kcc/com/uss/ion/cu/service/CaseUtilVO.java b/src/main/java/kcc/com/uss/ion/cu/service/CaseUtilVO.java index 1d29de7f..a7729bfe 100644 --- a/src/main/java/kcc/com/uss/ion/cu/service/CaseUtilVO.java +++ b/src/main/java/kcc/com/uss/ion/cu/service/CaseUtilVO.java @@ -19,6 +19,8 @@ public class CaseUtilVO extends ComDefaultVO implements Serializable{ public String pendencyPeriod =""; //처리기간 public String firstEndDt =""; //1차 협의회 개최일 public String secondEndDt =""; //2차 협의회 개최일 + public String dblrtEndYn =""; //심의사건 1차 협의회에서 종료 여부 + public String getCaseNo() { return caseNo; @@ -86,6 +88,12 @@ public class CaseUtilVO extends ComDefaultVO implements Serializable{ public void setSecondEndDt(String secondEndDt) { this.secondEndDt = secondEndDt; } + public String getDblrtEndYn() { + return dblrtEndYn; + } + public void setDblrtEndYn(String dblrtEndYn) { + this.dblrtEndYn = dblrtEndYn; + } diff --git a/src/main/java/kcc/com/uss/ion/cu/service/Impl/CaseUtilServiceImpl.java b/src/main/java/kcc/com/uss/ion/cu/service/Impl/CaseUtilServiceImpl.java index c10b6ccb..d5c9c65a 100644 --- a/src/main/java/kcc/com/uss/ion/cu/service/Impl/CaseUtilServiceImpl.java +++ b/src/main/java/kcc/com/uss/ion/cu/service/Impl/CaseUtilServiceImpl.java @@ -36,7 +36,9 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case HolidayVO holidayVO = new HolidayVO(); /*사건번호로 심의 안건 조회 후 있는 경우 - 1차 협의회 개최일을 조정 종요일로 계산, 2차 협의회 개최일을 조정 종료일2로 - 심의 안건이 없는 경우 현재 협의회 개최일을 조정 종료일로*/ + 심의 안건이 없는 경우 현재 협의회 개최일을 조정 종료일로 + 심의 안건만 있지만, 수정의결이면서 결과가 심의가 아닌 경우 1차 협의회에서 종료 처리 + */ for(String caseNo : caseUtilVO.getCaseNoArray()) { try { @@ -55,7 +57,7 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case int stopReqTerm = (caseVO.getStopReqTerm() == null || caseVO.getStopReqTerm().trim().isEmpty()) ? 0 : Integer.parseInt(caseVO.getStopReqTerm().trim()); int appReqTerm = (caseVO.getAppReqTerm() == null || caseVO.getAppReqTerm().trim().isEmpty()) ? 0 : (Integer.parseInt(caseVO.getAppReqTerm().trim()) > 21 ? 21 : Integer.parseInt(caseVO.getAppReqTerm().trim())); - if("Y".equals(caseVO.getDblrtYn())) { //심의 안건이 있던 경우 firstEndDtStr 사용 + if("Y".equals(caseVO.getDblrtYn()) && !"Y".equals(caseVO.getDblrtEndYn())) { //심의 안건이 있던 경우 firstEndDtStr 사용 String SecondendDateStr = endDate.format(outputFormatter); //SecondendDateStr : 'YYYY-MM-DD HH:MM'(2차 보고일) endDate = LocalDate.parse(firstEndDtStr, MediationEndDateFormatter); caseVO.setSecondEndDt(SecondendDateStr); diff --git a/src/main/resources/egovframework/sqlmap/com/uss/ion/cu/CaseUtil_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/com/uss/ion/cu/CaseUtil_SQL_Oracle.xml index f83c994e..18fd7e77 100644 --- a/src/main/resources/egovframework/sqlmap/com/uss/ion/cu/CaseUtil_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/com/uss/ion/cu/CaseUtil_SQL_Oracle.xml @@ -18,16 +18,31 @@ THEN 'Y' ELSE 'N' END AS dblrtYn, + CASE + WHEN NVL(jcd.MEDIATION_SMALL, '') NOT IN ('0616000000', '0617000000', '0618000000') + AND NVL(jcd.MOD_RESOLUTION, '') = 'Y' + THEN 'Y' + ELSE 'N' + END AS dblrtEndYn, ccm.FIX_DAY AS firstEndDt FROM C_MASTER cm LEFT JOIN ( - SELECT - cd.CASE_NO, - MIN(cd.CFRNC_NO) AS CFRNC_NO - FROM - C_DLBRTMTR cd - GROUP BY cd.CASE_NO - ) jcd + SELECT + CASE_NO, + MEDIATION_SMALL, + MOD_RESOLUTION, + CFRNC_NO + FROM ( + SELECT + cd.CASE_NO, + cd.MEDIATION_SMALL, + cd.MOD_RESOLUTION, + cd.CFRNC_NO, + ROW_NUMBER() OVER (PARTITION BY cd.CASE_NO ORDER BY cd.CFRNC_NO) AS rn + FROM + C_DLBRTMTR cd + ) WHERE rn = 1 + ) jcd ON cm.CASE_NO = jcd.CASE_NO LEFT JOIN C_CFRNCMANAGE ccm diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml index 11a8d275..4b0674c8 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml @@ -97,24 +97,25 @@ CODE_IDXS != '0200000000' AND CODE_PARENT_IDX = '0200000000' AND CODE_STATUS = 'U' - + + + 가맹거래팀 AND CODE_IDXS != '0202000000' - + 건설하도급팀, 제조하도급팀 AND CODE_IDXS != '0203000000' - + 약관팀 AND CODE_IDXS != '0205000000' - + 유통팀 AND CODE_IDXS != '0204000000' - + 대리점팀 AND CODE_IDXS != '0206000000' - + --> diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml index 98715b3a..0732f901 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml @@ -1321,10 +1321,18 @@ UPDATE C_RCEPTMST SET + CASE_GUBUN = #{caseGubun}, + + CASE_REASON1 = #{caseReason1}, + + CASE_REASON2 = #{caseReason2}, + + CASE_REASON3 = #{caseReason3}, + SCCHF_ASSIGN = #{presidentAssign}, SCCHF_ASSIGN_DT = SYSDATE, TIMHDER_ASSIGN = #{presidentAssign} @@ -1359,10 +1367,18 @@ UPDATE C_RCEPTMST SET + CASE_GUBUN = #{caseGubun}, + + CASE_REASON1 = #{caseReason1}, + + CASE_REASON2 = #{caseReason2}, + + CASE_REASON3 = #{caseReason3}, + SCCHF_ASSIGN = #{presidentAssign}, TIMHDER_ASSIGN = #{presidentAssign} ,FTC_CHECK = 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 5a9d90f7..b44f5021 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 @@ -138,6 +138,7 @@ var gubunList = $("#caseGubun option"); } var simlist = new Array(); +var simEndlist = new Array(); //심의안건 셋팅 function loadSimData(){ var url = ""; @@ -187,6 +188,11 @@ function loadSimData(){ html = '' $("#trublcfrncmngSelect").append(html); + //심의에서 끝나는 사건 처리 - 수정의결이면서 소분류 결과가 심의 관련이 아닌 경우 + if(v.modResolution == 'Y' && (v.mediationSmallSim != '0616000000' && v.mediationSmallSim != '0617000000' && v.mediationSmallSim != '0618000000')){ + simEndlist.push(v.caseNo); + } + }); $("#arrListsim").val(simlist); }else{ @@ -1102,13 +1108,13 @@ function StateProUpdt(statePro){ function resultGo(){ if(confirm("종료통지 단계로 넘어가시겠습니까?")){ //보고안건 사건들 조정종료일, 처리기간 자동 저장 - if(bogolist.length != 0){ - $("#caseNoArray").val(bogolist); + if(bogolist.length != 0 || simEndlist.length != 0){ + $("#caseNoArray").val(bogolist.concat(simEndlist)); $("#mediationEndDt").val($("#fixDay").val()); var url = "/gtm/caseUtil/updateAutoEndDtAjax.do"; var param = jQuery('#dateFrm').serialize(); XHR2(url, param, function(r){ - if(r.result == 'success'){ + /* if(r.result == 'success'){ var url = ""; $("#statePro").val('0503000000'); //$("#masterStatePro").val('0405000000'); @@ -1123,7 +1129,7 @@ function resultGo(){ }else{ alert(r.failCaseNo+" 오류 발생하였습니다. 담당자에게 문의 바랍니다."); return false; - } + } */ }); } diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp index 4bc6e1ca..f54b7283 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp @@ -148,11 +148,11 @@ $(document).ready(function(){ return false; } - if($("#caseReason1").val() == ""){ + /* if($("#caseReason1").val() == ""){ alert("신청사유를 선택해 주세요"); $("#caseReason1").focus(); return false; - } + } */ /* if($("#caseReason1").val() == "" && $("#caseReason2").val() == "" && $("#caseReason3").val() == ""){ alert("신청사유는 한개 이상 선택 해 주세요."); @@ -186,11 +186,11 @@ $(document).ready(function(){ return false; } - if($("#caseReason1").val() == ""){ + /* if($("#caseReason1").val() == ""){ alert("신청사유를 선택해 주세요"); $("#caseReason1").focus(); return false; - } + } */ $("#type").val("U"); var param = jQuery('#frm').serialize(); @@ -231,11 +231,11 @@ $(document).ready(function(){ return false; } - if($("#caseReason1").val() == ""){ + /* if($("#caseReason1").val() == ""){ alert("신청사유를 선택해 주세요"); $("#caseReason1").focus(); return false; - } + } */ /* if($("#caseReason1").val() == "" && $("#caseReason2").val() == "" && $("#caseReason3").val() == ""){ alert("신청사유는 한개 이상 선택 해 주세요."); @@ -505,7 +505,8 @@ $(document).ready(function(){ }); /* 부서변경 시 조정유형도 selected 처리 */ - $("#presidentAssign").change(function(){ + /* 250418 - 담당자 요청으로 부서 변경 시 조정유형, 신청유형 변경 막기 */ + /* $("#presidentAssign").change(function(){ var presidentAssignVal = ""; if($("#presidentAssign").val() == '${SeedConstants.GONGJEONG1}' || $("#presidentAssign").val() == '${SeedConstants.GONGJEONG2}' @@ -558,7 +559,7 @@ $(document).ready(function(){ resnCombo(); showConsignmentGubun(); - }); + }); */ /*=========초기값 셋팅========*/ @@ -717,13 +718,17 @@ $(document).ready(function(){ /*=========초기값 셋팅 END========*/ - + /* 250418 - 담당자 요청으로 부서 변경 시 조정유형, 신청유형 변경 막기 */ + $("#caseGubun").attr("disabled", true); + $("#caseReason1").attr("disabled", true); + $("#caseReason2").attr("disabled", true); + $("#caseReason3").attr("disabled", true); }); //조정유형 function caseGubunCombo(){ - var url = ""; + var url = ""; $("#type").val("L"); var param = jQuery('#frm').serialize(); url = "/gtm/case/common/ajax/CaseGubun.do"; @@ -731,6 +736,7 @@ function caseGubunCombo(){ var objList = $("#caseGubun"); var sel = ""; ajaxCombo(r.data, objList, sel); + }); }