Browse Source

Merge commit 'ad7dde789e1e9d02178d4295c8c08b49346ca453' into develop

pull/16/head
lkd9125(이경도) 10 months ago
parent
commit
5c2e35ad39
  1. 2
      pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
  2. 2
      pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
  3. 2
      pav-server/src/main/resources/application.yml

2
pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java

@ -43,7 +43,7 @@ public class MainDashController {
* @return * @return
*/ */
@GetMapping(value = "/stcs/day") @GetMapping(value = "/stcs/day")
@ApiOperation(value = "일 별 비행수 통계") @ApiOperation(value = "일 별 비행수 통계")
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API")
@ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class) @ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> stcsDay(String yyyymm) { public ResponseEntity<? extends BasicResponse> stcsDay(String yyyymm) {

2
pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@ -2065,7 +2065,7 @@ public class FltPlanQueryRepository {
.leftJoin(arcrft) .leftJoin(arcrft)
.on(bas.planSno.eq(arcrft.planSno)) .on(bas.planSno.eq(arcrft.planSno))
.leftJoin(area) .leftJoin(area)
.on(area.planSno.eq(area.planSno)) .on(bas.planSno.eq(area.planSno))
.where( .where(
arcrft.idntfNum.eq(idntfNum) arcrft.idntfNum.eq(idntfNum)
.and(bas.aprvlYn.eq("Y")) .and(bas.aprvlYn.eq("Y"))

2
pav-server/src/main/resources/application.yml

@ -17,6 +17,8 @@ spring:
devtools: devtools:
livereload: livereload:
enabled: true enabled: true
restart:
enabled: false
servlet: servlet:
multipart: multipart:
enabled: true enabled: true

Loading…
Cancel
Save