diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index 9f823d8c..f23f08f4 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -331,6 +331,7 @@ AND 0 = (SELECT COUNT(*) FROM C_ENDMTR WHERE CASE_NO = A.CASE_NO) AND MEDIATION_BIG NOT IN ('0616010000', '0617010000', '0618010000') AND MEDIATION_SMALL NOT IN ('0616000000', '0617000000', '0618000000') + AND (MEDIATION_END_DT IS NULL or MEDIATION_END_DT = '') AND CASE_NO IN diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index b40cb8cb..56660783 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -833,6 +833,16 @@ $("#periodCalulation").click(function(){ return false; } + //중지기간, 보완기간 입력 체크(시작, 종료일이 있을 경우) + if(($("#stopReqDt").val() != '' || $("#stopSubmitDt").val() != '') && $("#stopReqTerm").val() ==''){ + alert("중지기간을 입력해주세요."); + return false; + } + if(($("#appReqDt").val() != '' || $("#appSubmitDt").val() != '') && $("#appReqTerm").val() ==''){ + alert("보완기간을 입력해주세요."); + return false; + } + $.blockUI({ message : '

  잠시만 기다려주세요.

' }); var url = ""; @@ -849,6 +859,8 @@ $("#periodCalulation").click(function(){ $("#subcntrAmount").val($("#subcntrAmount").val().replace(/,/gi, "")); } + + $("#type").val("S"); var param = jQuery('#frm').serialize(); url = "/gtm/case/trublprocessmng/ajax/CaseRceCount.do";