diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java index 89f36506..b1819789 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java @@ -1,5 +1,6 @@ package com.palnet.biz.api.acnt.cstmr.model; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.palnet.biz.config.convert.InstantDateStrSerializer; import lombok.Data; @@ -28,6 +29,7 @@ public class AnctCstmerRlModel { private String updateuserId; + @JsonInclude(JsonInclude.Include.ALWAYS) private String cptAuthCode; } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java index 4824a4a3..0dd4652c 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java @@ -1,6 +1,5 @@ package com.palnet.biz.api.bas.flight.model; -import com.palnet.biz.jpa.entity.type.FltMethod; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -32,22 +31,5 @@ public class BasFlightPlanAreaModel { // kac μΆ”κ°€ ν•„λ“œ private String fltMothoeRm; -// public BasFlightPlanAreaModel(Integer planAreaSno, Integer planSno, String areaType, FltMethod fltMethod, String fltAreaAddr, Integer bufferZone, String fltElev, String createUserId, Instant createDt, String updateUserId, Instant updateDt, String docState, List coordList, List bufferCoordList, String fltMothoeRm) { -// this.planAreaSno = planAreaSno; -// this.planSno = planSno; -// this.areaType = areaType; -// this.fltMethod = fltMethod.getCode(); -// this.fltMethodNm = fltMethod.getValue(); -// this.fltAreaAddr = fltAreaAddr; -// this.bufferZone = bufferZone; -// this.fltElev = fltElev; -// this.createUserId = createUserId; -// this.createDt = createDt; -// this.updateUserId = updateUserId; -// this.updateDt = updateDt; -// this.docState = docState; -// this.coordList = coordList; -// this.bufferCoordList = bufferCoordList; -// this.fltMothoeRm = fltMothoeRm; -// } + } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java index c3014cba..c62e7c89 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java @@ -277,6 +277,7 @@ public class PtyCstmrQueryRepository { dtl.email, dtl.hpno, dtl.updateDt, + bas.cptAuthCode, bas.userId )) .from(bas)