Merge branch 'JIWOO'

src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java

@@ -138,6 +138,11 @@ public class HolidayController {
 		LocalDate startDate = LocalDate.parse(std, formatter);
 		LocalDate endDate = LocalDate.parse(etd, formatter);
 		
+		//시작일에 하루 더해서 set 해주기 - 시작일이 공휴일 또는 주말인 경우 대비ㄱ
+		startDate = startDate.plusDays(1);
+		std = startDate.format(formatter);
+		holidayVO.setSdt(std);
+		
 		//공휴일 수
 		int hldCnt = holidayService.selectHolidayCnt(holidayVO);
 		
@@ -149,7 +154,7 @@ public class HolidayController {
 				workCnt++;
 			}
 		}
-		workCnt = workCnt - hldCnt -1;
+		workCnt = workCnt - hldCnt;
 		return new ResponseEntity<Integer>(workCnt, HttpStatus.OK);
 	}
 }

src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml

@@ -59,6 +59,6 @@
 			C_RESTDEINFO A
 		WHERE
 			A.DEL_YN = 'N'
-			AND A.LOCDATE BETWEEN #sdt# AND #edt#
+			AND TO_DATE(A.LOCDATE, 'YYYYMMDD') BETWEEN TO_DATE(#sdt#, 'YYYYMMDD') AND TO_DATE(#edt#, 'YYYYMMDD')
 </select>
 </sqlMap>

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

@@ -293,7 +293,7 @@ $(document).ready(function(){
 
   }); */
 
-  $("#stopCalculation").click(function(){
+  /* $("#stopCalculation").click(function(){
 	if($("#stopReqDt").val() == ""){
 	  alert("중지 시작일을 입력 해 주세요.");
 	  return false;
@@ -312,7 +312,7 @@ $(document).ready(function(){
 	var stopReqTerm = (stopSubmitDt - stopReqDt) / stopCurrDay;
 
 	$("#stopReqTerm").val(stopReqTerm);
-  });
+  }); */
 
 /*   $("#anwCalculation").click(function(){
     if($("#answerReqDt").val() == ""){
@@ -377,7 +377,23 @@ $(document).ready(function(){
     }
   }); */
   
+//중지기간 계산
+  $("#stopCalculation").click(function(){
+		if($("#stopReqDt").val() == ""){
+		  alert("중지 시작일을 입력 해 주세요.");
+		  return false;
+		}
 
+		if($("#stopSubmitDt").val() == ""){
+		  alert("중지 종료일을 입력 해 주세요.");
+		  return false;
+		}
+
+		var stopReqDt = $("#stopReqDt").val().replace(/-/gi,"");
+		var stopSubmitDt = $("#stopSubmitDt").val().replace(/-/gi,"");
+		returnTerm(stopReqDt,stopSubmitDt,"stopReqTerm");
+	  });
+  
 //신청서 보완기간 계산
   $("#suppCalculation").click(function(){
     if($("#appReqDt").val() == ""){
@@ -4416,6 +4432,8 @@ function returnTerm(sdt,edt,gubun){
 		success: function(response) {
 			if(gubun == "appReqTerm"){
 				$("#appReqTerm").val(response);
+			}else if(gubun == "stopReqTerm"){
+				$("#stopReqTerm").val(response);
 			}else if(gubun == "answerTerm"){
 				$("#answerTerm").val(response);
 			}else if(gubun == "pendencyPeriod"){