diff --git a/src/main/java/cokr/xit/ens/core/model/EnsBillAcptReqDTO.java b/src/main/java/cokr/xit/ens/core/model/EnsBillAcptReqDTO.java index 7c75b61..119c1b5 100644 --- a/src/main/java/cokr/xit/ens/core/model/EnsBillAcptReqDTO.java +++ b/src/main/java/cokr/xit/ens/core/model/EnsBillAcptReqDTO.java @@ -1,22 +1,28 @@ package cokr.xit.ens.core.model; -import cokr.xit.ens.modules.common.ctgy.intgrnbill.support.code.BillSeCd; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.Length; + import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; + +import cokr.xit.ens.modules.common.ctgy.intgrnbill.support.code.BillSeCd; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; @Builder @Getter @Setter @Schema(name = "EnsBillAcptReqDTO") +@NoArgsConstructor +@AllArgsConstructor public class EnsBillAcptReqDTO { // @NotNull(message = "청구서ID 사용 여부는 필수 입력값 입니다.") @@ -24,14 +30,14 @@ public class EnsBillAcptReqDTO { // private Boolean use_bill_uid; @Schema(hidden = true, required = false, title = "청구서 유니크ID", example = " ") - @JsonProperty("billUid") + @JsonProperty("billUid") @JsonAlias({"bill_uid"}) @SerializedName(value = "billUid", alternate = {"bill_uid"}) private String billUid; @NotNull(message = "청구서 타입은 필수 입력값 입니다.") @Schema(required = true, title = "청구서 타입", example = "all") - @JsonProperty("billSe") + @JsonProperty("billSe") @JsonAlias({"bill_se"}) @SerializedName(value = "billSe", alternate = {"bill_se"}) private BillSeCd billSe; @@ -39,9 +45,9 @@ public class EnsBillAcptReqDTO { @NotBlank(message = "빌러유저키는 필수 입력값 입니다.") @Length(max = 40, message = "빌러유저키의 최대 길이를 초과 했습니다.") @Schema(required = true, title = "기관에서 관리하는 해당 고객번호 혹은 계약번호", example = " ") - @JsonProperty("billerUserKey") + @JsonProperty("billerUserKey") @JsonAlias({"biller_user_key"}) - @SerializedName(value = "billerUserKey", alternate = {"biller_user_key"}) + @SerializedName(value = "billerUserKey", alternate = {"biller_user_key"}) private String billerUserKey; diff --git a/src/main/java/cokr/xit/ens/modules/common/ctgy/intgrnnoti/service/support/IntgrnNotiAcceptor.java b/src/main/java/cokr/xit/ens/modules/common/ctgy/intgrnnoti/service/support/IntgrnNotiAcceptor.java index e771e15..9155591 100644 --- a/src/main/java/cokr/xit/ens/modules/common/ctgy/intgrnnoti/service/support/IntgrnNotiAcceptor.java +++ b/src/main/java/cokr/xit/ens/modules/common/ctgy/intgrnnoti/service/support/IntgrnNotiAcceptor.java @@ -131,20 +131,20 @@ public class IntgrnNotiAcceptor implements EnsPhaseProcSupport, Kk String expDate = DateUtil.getTimeOfTimeT(document.getReadExpiresAt(), "yyyyMMddHHmmss"); int sec = DateUtil.secByFromBetweenTo(DateUtil.toLocalDateTime(expDate), DateUtil.toLocalDateTime(reqDTO.getClose_dt())); if (sec < 0) - result.add(String.format("마감일시보다 \"처리마감시간\"이 느립니다. [ document[%d].acpt_data.kko_talk.read_expires_at ]", i.get())); + result.add(String.format("마감일시보다 \"최초열람 마감시간\"이 느립니다. [ document[%d].acpt_data.kko_talk.readExpiresAt ]", i.get())); } if (!CmmnUtil.isEmpty(document.getReviewExpiresAt())) { String expDate = DateUtil.getTimeOfTimeT(document.getReviewExpiresAt(), "yyyyMMddHHmmss"); int sec = DateUtil.secByFromBetweenTo(DateUtil.toLocalDateTime(expDate), DateUtil.toLocalDateTime(reqDTO.getClose_dt())); if (sec < 0) - result.add(String.format("마감일시보다 \"처리마감시간\"이 느립니다. [ document[%d].acpt_data.kko_talk.read_expires_at ]", i.get())); + result.add(String.format("마감일시보다 \"재열람 만료일시\"가 느립니다. [ document[%d].acpt_data.kko_talk.readExpiresAt ]", i.get())); } } i.getAndIncrement(); diff --git a/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml b/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml index 2db7390..ecd13e0 100644 --- a/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml +++ b/src/main/resources/mybatis-mapper/modules/iup-kkotalk-mapper.xml @@ -37,7 +37,7 @@ #{payload}, #{readExpiresAt}, #{reviewExpiresAt}, - #{useNonPersonalizedNoti}, + #{useNonPersonalizedNotification}, #{ci}, #{phoneNumber}, #{name}, @@ -61,7 +61,7 @@ payload, read_expires_at, review_expires_at, - use_non_personalized_noti, + use_non_personalized_noti AS useNonPersonalizedNotification, ci, phone_number, name,