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

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

@@ -139,7 +139,7 @@ public class HolidayController {
 		LocalDate endDate = LocalDate.parse(etd, formatter);
 		
 		//시작일에 하루 더해서 set 해주기 - 시작일이 공휴일 또는 주말인 경우 대비ㄱ
-		startDate = startDate.plusDays(1);
+		/*startDate = startDate.plusDays(1);*/
 		std = startDate.format(formatter);
 		holidayVO.setSdt(std);
 		

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

@@ -26,14 +26,20 @@
 		
 	</select>
 	
-	<update id="holidayDAO.deleteHoliday" parameterClass="holidayVO">
+	<!-- <update id="holidayDAO.deleteHoliday" parameterClass="holidayVO">
 		UPDATE C_RESTDEINFO
 		SET
 			DEL_YN = 'Y',
 			UPD_DT = sysdate
 		WHERE LOCDATE = #locdate#
 		AND	DATE_NAME = #dateName#
-	</update>
+	</update> -->
+	
+	<delete id="holidayDAO.deleteHoliday" parameterClass="holidayVO">
+		DELETE FROM C_RESTDEINFO
+		WHERE LOCDATE = #locdate#
+		AND	DATE_NAME = #dateName#
+	</delete>
 	
 	<insert id="holidayDAO.insertHoliday" parameterClass="holidayVO">
 		INSERT INTO C_RESTDEINFO (LOCDATE, DATE_KIND, DATE_NAME, HOLIDAY_YN, DEL_YN, REG_DT )
@@ -60,5 +66,6 @@
 		WHERE
 			A.DEL_YN = 'N'
 			AND TO_DATE(A.LOCDATE, 'YYYYMMDD') BETWEEN TO_DATE(#sdt#, 'YYYYMMDD') AND TO_DATE(#edt#, 'YYYYMMDD')
+			AND TO_CHAR(TO_DATE(A.LOCDATE, 'YYYYMMDD'), 'D') NOT IN ('1', '7')
 </select>
 </sqlMap>

src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml

@@ -30,7 +30,8 @@
 
           SELECT
                 AA.CASE_NO,
-          AA.APP_REQ_TERM,
+                AA.APP_REQ_TERM,
+                AA.STOP_REQ_TERM,
                 AA.CASE_GUBUN,
                 AA.CASE_EXTEND,
                 (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = AA.CASE_GUBUN) AS CASE_GUBUN_NM,
@@ -282,7 +283,8 @@
      FROM (
           SELECT
                   A.CASE_NO,
-          A.APP_REQ_TERM,
+                  A.APP_REQ_TERM,
+                  A.STOP_REQ_TERM,
                   A.CASE_GUBUN,
                   A.CASE_EXTEND,
                   (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.CASE_GUBUN) AS CASE_GUBUN_NM,

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

@@ -5317,7 +5317,7 @@ function docOpen(obj) {
           <th>사건번호</th>
           <td>
             <c:out value="${masterData.caseNo }"/>
-            (<c:out value="${masterData.caseDate2 }"/> 접수. <c:out value="${masterData.proDate }"/>일 경과)
+            (<c:out value="${masterData.caseDate2 }"/> 접수. <c:out value="${masterData.proDate - (masterData.stopReqTerm ne null ? masterData.stopReqTerm : 0)}"/>일 경과)
           </td>
         </tr>
 		<c:forEach var="rs" items="${caseApplcntData}" varStatus="sts">

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

@@ -296,7 +296,7 @@ function clipCall(crfNm){
 										<td>${list.mediationBig}</td>
 										<td>${list.mediationSmall}</td>
 										<td>${list.caseDate}</td>
-										<td>${list.proDate}</td>
+										<td>${list.proDate - (list.stopReqTerm ne null ? list.stopReqTerm : 0)}</td>
                                         <td>                                        
                                             <c:choose>
                                             	<c:when test="${list.appReqTerm == null}">-</c:when>