From 7b6e0371876f4a59cc27396e8be6fb11a3e4fffd Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 18 Apr 2025 11:56:02 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=EA=B8=B0=EA=B0=84=EC=97=90=20=EB=B3=B4=EC=99=84?= =?UTF-8?q?=EA=B8=B0=EA=B0=84,=20=EC=A4=91=EC=A7=80=EA=B8=B0=EA=B0=84=20?= =?UTF-8?q?=EC=A6=9D=EA=B0=90=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/uss/ion/cu/service/Impl/CaseUtilServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 103267ae..c10b6ccb 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 @@ -34,6 +34,7 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case CaseUtilVO caseVO = new CaseUtilVO(); HolidayVO holidayVO = new HolidayVO(); + /*사건번호로 심의 안건 조회 후 있는 경우 - 1차 협의회 개최일을 조정 종요일로 계산, 2차 협의회 개최일을 조정 종료일2로 심의 안건이 없는 경우 현재 협의회 개최일을 조정 종료일로*/ @@ -49,7 +50,10 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case String firstEndDtStr = caseVO.getFirstEndDt(); //firstEndDtStr : 'YYYY-MM-DD HH:MM' LocalDate caseDate = LocalDate.parse(caseDateStr, caseDateFormatter); //caseDate : 'YYYY-MM-DD' LocalDate endDate = LocalDate.parse(endDateStr, MediationEndDateFormatter); //endDate : 'YYYY-MM-DD' - + + //중지기간, 보완기간 + 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 사용 String SecondendDateStr = endDate.format(outputFormatter); //SecondendDateStr : 'YYYY-MM-DD HH:MM'(2차 보고일) @@ -72,7 +76,7 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case workCnt++; } } - workCnt = workCnt - hldCnt; + workCnt = workCnt - hldCnt - stopReqTerm -appReqTerm; caseVO.setPendencyPeriod(Integer.toString(workCnt)); this.updateCaseEndDt(caseVO);