Browse Source

비행건수 계획서 없는데 완료 카운트 되는 현상 수정

pull/16/head
지대한 10 months ago
parent
commit
4e6ae1b998
  1. 2
      pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java
  2. 16
      pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java

2
pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java

@ -216,7 +216,7 @@ public class BasLaancService {
corpRegYn = isCorpReg ? "Y" : "N"; corpRegYn = isCorpReg ? "Y" : "N";
} }
fltPlanBas.setCorpRegYn(corpRegYn); // 사업자유무 fltPlanBas.setCorpRegYn(corpRegYn); // 사업자유무
fltPlanBas.setServiceType("PAV-KAC"); fltPlanBas.setServiceType("F0002");
FltPlanBas rBasEntity = fltPlanBasRepository.save(fltPlanBas); FltPlanBas rBasEntity = fltPlanBasRepository.save(fltPlanBas);
Integer planSno = rBasEntity.getPlanSno(); Integer planSno = rBasEntity.getPlanSno();

16
pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java

@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -410,13 +411,14 @@ public class MainDashService {
} }
// 1. 전일 , 금일, 명일(내일) // 1. 전일 , 금일, 명일(내일)
Instant yesterdayStart = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); // ZoneId zoneId = ZoneId.systemDefault();
Instant yesterdayEnd = Instant.now().truncatedTo(ChronoUnit.DAYS); ZoneId zoneId = ZoneId.of("Asia/Seoul");
Instant todayStart = Instant.now().truncatedTo(ChronoUnit.DAYS); Instant yesterdayStart = Instant.now().atZone(zoneId).minusDays(1).truncatedTo(ChronoUnit.DAYS).toInstant();
Instant todayEnd = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); Instant yesterdayEnd = Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).toInstant();
Instant tomorrowStart = Instant.now().plus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); Instant todayStart = Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).toInstant();
Instant tomorrowEnd = Instant.now().plus(2, ChronoUnit.DAYS).truncatedTo(ChronoUnit.DAYS); Instant todayEnd = Instant.now().atZone(zoneId).plusDays(1).truncatedTo(ChronoUnit.DAYS).toInstant();
Instant tomorrowEnd2 = Instant.now().plus(2, ChronoUnit.DAYS).minus(1, ChronoUnit.SECONDS); Instant tomorrowStart = Instant.now().atZone(zoneId).plusDays(1).truncatedTo(ChronoUnit.DAYS).toInstant();
Instant tomorrowEnd = Instant.now().atZone(zoneId).plusDays(2).truncatedTo(ChronoUnit.DAYS).toInstant();
// 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일) // 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일)
int yesterdayCount = 0; int yesterdayCount = 0;

Loading…
Cancel
Save