diff --git a/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java b/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java index a27d828e..376530d1 100644 --- a/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java +++ b/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); diff --git a/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml index 38c6d9a6..85597ad5 100644 --- a/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml @@ -26,14 +26,20 @@ - + + + + DELETE FROM C_RESTDEINFO + WHERE LOCDATE = #locdate# + AND DATE_NAME = #dateName# + 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') diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml index 0292cf8f..1031526c 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml +++ b/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, 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 cc0158df..427d0deb 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 @@ -5317,7 +5317,7 @@ function docOpen(obj) { 사건번호 - ( 접수. 일 경과) + ( 접수. 일 경과) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp index 151099fe..3799a03e 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/trublprocessmngList.jsp @@ -296,7 +296,7 @@ function clipCall(crfNm){ ${list.mediationBig} ${list.mediationSmall} ${list.caseDate} - ${list.proDate} + ${list.proDate - (list.stopReqTerm ne null ? list.stopReqTerm : 0)} -