From 044bd69ac92f372d452074b79afcf7e2ee6a4e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=83=81=ED=98=84?= <gus516@palnet.co.kr>
Date: Thu, 18 Jan 2024 17:27:18 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EC=B6=9C=20=EC=9D=BC=EB=AC=BC=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=A1=B0=ED=9A=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/laanc/step/LaancStep1.js | 55 +++++++++++++++++--------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/components/laanc/step/LaancStep1.js b/src/components/laanc/step/LaancStep1.js
index b83b6ffd..62ea23c3 100644
--- a/src/components/laanc/step/LaancStep1.js
+++ b/src/components/laanc/step/LaancStep1.js
@@ -828,21 +828,27 @@ export default function LaancStep1({
                             detailData => {
                               const detailDataDateTime = dayjs(
                                 detailData.locDate,
-                                'YYYYMMDD'
+                                'day'
                               );
 
                               return detailDataDateTime.isSame(
-                                dayjs(value, 'YYYYMMDD')
+                                dayjs(value),
+                                'day'
                               );
                             }
                           );
-
-                          const schFltStDt = dayjs(value).format('HHmmss');
+                          const schFltStDt = dayjs(value).format('HH:mm:ss');
 
                           filtereddetailData.forEach(detailData => {
                             if (
-                              schFltStDt <= detailData.civilm ||
-                              schFltStDt >= detailData.civile
+                              value <=
+                                dayjs(
+                                  detailData.locDate + detailData.civilm
+                                ).format('YYYY-MM-DD HH:mm:ss') ||
+                              value >=
+                                dayjs(
+                                  detailData.locDate + detailData.civile
+                                ).format('YYYY-MM-DD HH:mm:ss')
                             ) {
                               setIsLaancModal({
                                 isOpen: true,
@@ -863,10 +869,14 @@ export default function LaancStep1({
                                 value:
                                   schFltStDt <= detailData.civilm ||
                                   schFltStDt >= detailData.civile
-                                    ? dayjs(detailData.civilm, 'HHmmss')
-                                        .add(5, 'minute')
+                                    ? dayjs(
+                                        detailData.locDate + detailData.civilm
+                                      )
+                                        .add(-5, 'minute')
                                         .format('YYYY-MM-DD HH:mm:ss')
-                                    : dayjs()
+                                    : dayjs(
+                                        detailData.locDate + detailData.civilm
+                                      )
                                         .add(5, 'minute')
                                         .format('YYYY-MM-DD HH:mm:ss')
                               });
@@ -932,19 +942,26 @@ export default function LaancStep1({
                             detailData => {
                               const detailDataDateTime = dayjs(
                                 detailData.locDate,
-                                'YYYYMMDD'
+                                'day'
                               );
+
                               return detailDataDateTime.isSame(
-                                dayjs(value, 'YYYYMMDD')
+                                dayjs(value),
+                                'day'
                               );
                             }
                           );
-                          const schFltEndDt = dayjs(value).format('HHmmss');
-
+                          const schFltEndDt = dayjs(value).format('HH:mm:ss');
                           filtereddetailData.forEach(detailData => {
                             if (
-                              schFltEndDt <= detailData.civilm ||
-                              schFltEndDt >= detailData.civile
+                              value <=
+                                dayjs(
+                                  detailData.locDate + detailData.civilm
+                                ).format('YYYY-MM-DD HH:mm:ss') ||
+                              value >=
+                                dayjs(
+                                  detailData.locDate + detailData.civile
+                                ).format('YYYY-MM-DD HH:mm:ss')
                             ) {
                               setIsLaancModal({
                                 isOpen: true,
@@ -965,10 +982,14 @@ export default function LaancStep1({
                                 value:
                                   schFltEndDt <= detailData.civilm ||
                                   schFltEndDt >= detailData.civile
-                                    ? dayjs(detailData.civile, 'HHmmss')
+                                    ? dayjs(
+                                        detailData.locDate + detailData.civile
+                                      )
                                         .add(-5, 'minute')
                                         .format('YYYY-MM-DD HH:mm:ss')
-                                    : dayjs()
+                                    : dayjs(
+                                        detailData.locDate + detailData.civile
+                                      )
                                         .add(5, 'minute')
                                         .format('YYYY-MM-DD HH:mm:ss')
                               });