일출 일물 데이터 조회 수정

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')
                               });