pav
/
pav-fe-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

일출 일물 데이터 조회 수정

master
박상현 8 months ago
parent
5377629a53
commit
044bd69ac9
1 changed files with 38 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      src/components/laanc/step/LaancStep1.js

55
src/components/laanc/step/LaancStep1.js
Unescape View File

@ -828,21 +828,27 @@ export default function LaancStep1({
detailData => { detailData => {
const detailDataDateTime = dayjs( const detailDataDateTime = dayjs(
detailData.locDate, detailData.locDate,
'YYYYMMDD' 'day'
); );
return detailDataDateTime.isSame( return detailDataDateTime.isSame(
dayjs(value, 'YYYYMMDD') dayjs(value),
'day'
); );
} }
); );
const schFltStDt = dayjs(value).format('HH:mm:ss');
const schFltStDt = dayjs(value).format('HHmmss');
filtereddetailData.forEach(detailData => { filtereddetailData.forEach(detailData => {
if ( if (
schFltStDt <= detailData.civilm || value <=
schFltStDt >= detailData.civile 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({ setIsLaancModal({
isOpen: true, isOpen: true,
@ -863,10 +869,14 @@ export default function LaancStep1({
value: value:
schFltStDt <= detailData.civilm || schFltStDt <= detailData.civilm ||
schFltStDt >= detailData.civile schFltStDt >= detailData.civile
? dayjs(detailData.civilm, 'HHmmss') ? dayjs(
.add(5, 'minute') detailData.locDate + detailData.civilm
)
.add(-5, 'minute')
.format('YYYY-MM-DD HH:mm:ss') .format('YYYY-MM-DD HH:mm:ss')
: dayjs() : dayjs(
detailData.locDate + detailData.civilm
)
.add(5, 'minute') .add(5, 'minute')
.format('YYYY-MM-DD HH:mm:ss') .format('YYYY-MM-DD HH:mm:ss')
}); });
@ -932,19 +942,26 @@ export default function LaancStep1({
detailData => { detailData => {
const detailDataDateTime = dayjs( const detailDataDateTime = dayjs(
detailData.locDate, detailData.locDate,
'YYYYMMDD' 'day'
); );
return detailDataDateTime.isSame( 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 => { filtereddetailData.forEach(detailData => {
if ( if (
schFltEndDt <= detailData.civilm || value <=
schFltEndDt >= detailData.civile 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({ setIsLaancModal({
isOpen: true, isOpen: true,
@ -965,10 +982,14 @@ export default function LaancStep1({
value: value:
schFltEndDt <= detailData.civilm || schFltEndDt <= detailData.civilm ||
schFltEndDt >= detailData.civile schFltEndDt >= detailData.civile
? dayjs(detailData.civile, 'HHmmss') ? dayjs(
detailData.locDate + detailData.civile
)
.add(-5, 'minute') .add(-5, 'minute')
.format('YYYY-MM-DD HH:mm:ss') .format('YYYY-MM-DD HH:mm:ss')
: dayjs() : dayjs(
detailData.locDate + detailData.civile
)
.add(5, 'minute') .add(5, 'minute')
.format('YYYY-MM-DD HH:mm:ss') .format('YYYY-MM-DD HH:mm:ss')
}); });

Write Preview
Loading…
Cancel
Save