From 97822a01e11f5ea7ebf050359c1605eced454881 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 18 Aug 2023 21:53:22 +0700 Subject: [PATCH] Update entity voucher paket Penambahan data kelas dan flag batal paket --- .../medifirst2000/entities/VoucherPaket.java | 13 ++++++++++++- .../jasamedika/medifirst2000/vo/VoucherPaketVO.java | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VoucherPaket.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VoucherPaket.java index 9b8cf657..b8d6e30c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VoucherPaket.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VoucherPaket.java @@ -23,7 +23,7 @@ import static javax.persistence.FetchType.LAZY; @Entity @Table(name = "voucherpaket_m", uniqueConstraints = @UniqueConstraint(columnNames = { "paketfk", "kode" })) public class VoucherPaket extends BaseTransaction { - private static final long serialVersionUID = 3602418183807488013L; + private static final long serialVersionUID = 5847793843382551441L; @ManyToOne(fetch = LAZY) @JoinColumn(name = "pasienfk") @@ -43,6 +43,15 @@ public class VoucherPaket extends BaseTransaction { @Column(name = "paketfk", insertable = false, updatable = false, nullable = false) private Integer paketId; + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "kelasfk") + @NotNull(message = "Kelas tidak boleh kosong") + @Caption(value = "Kelas") + private Kelas kelas; + + @Column(name = "kelasfk", insertable = false, updatable = false, nullable = false) + private Integer kelasId; + @Column(length = 7, nullable = false) @Size(max = 7, message = "Maksimal kode harus 7 karakter") @NotNull(message = "Kode tidak boleh kosong") @@ -55,4 +64,6 @@ public class VoucherPaket extends BaseTransaction { @Column(nullable = false) @NotNull(message = "Tanggal kedaluwarsa tidak boleh kosong") private Date tglKedaluwarsa; + + private Boolean isBatal; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/VoucherPaketVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/VoucherPaketVO.java index f3951412..2cecfd15 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/VoucherPaketVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/VoucherPaketVO.java @@ -26,6 +26,11 @@ public class VoucherPaketVO extends BaseTransactionVO { private Integer paketId; + @NotNull(message = "Kelas tidak boleh kosong") + private KelasVO kelas; + + private Integer kelasId; + @NotNull(message = "Kode tidak boleh kosong") @Size(message = "Maksimal kode harus 7 karakter", max = 7) private String kode; @@ -35,4 +40,6 @@ public class VoucherPaketVO extends BaseTransactionVO { @NotNull(message = "Tanggal kedaluwarsa tidak boleh kosong") private Date tglKedaluwarsa; + + private Boolean isBatal; } \ No newline at end of file