From 2c7eeb7bedcf64dd4fa5607eaeb11eaef611edeb Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 12 Apr 2021 21:29:10 +0700 Subject: [PATCH] rapi-rapi --- .../service/impl/OrderAmbulanceServiceImpl.java | 2 +- .../service/impl/OrderKendaraanDinasServiceImpl.java | 2 +- .../service/impl/OrderPemakaianRuangRapatServiceImpl.java | 2 +- .../service/impl/PemakaianRumahDukaServiceImpl.java | 2 +- .../service/impl/PemulasaraanJenazahServiceImpl.java | 2 +- .../medifirst2000/service/impl/SewaAsramaServiceImpl.java | 2 +- .../medifirst2000/service/impl/SewaLahanServiceImpl.java | 2 +- .../java/com/jasamedika/medifirst2000/entities/Produk.java | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java index 2fe3b030..3f03b8a8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java @@ -147,7 +147,7 @@ public class OrderAmbulanceServiceImpl extends BaseVoServiceImpl implements Orde orderPelayanan.setQtyProduk(listOrderPelayanan.get(i).getQtyProduk()); orderPelayanan.setQtyProdukRetur(listOrderPelayanan.get(i).getQtyProdukRetur()); orderPelayanan.setTglPelayanan(DateUtil.getShortDate()); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java index 6f347121..3a281792 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java @@ -174,7 +174,7 @@ public class OrderKendaraanDinasServiceImpl extends BaseVoServiceImpl implements produkConverter.transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); orderPelayanan.setProduk(produkDao.findById( Integer.parseInt((String) this.GetSettingDataFixed("KdProdukKendaraanDinas")))); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java index 832ee426..973efbba 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java @@ -220,7 +220,7 @@ public class OrderPemakaianRuangRapatServiceImpl extends BaseVoServiceImpl imple produkConverter.transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); orderPelayanan.setProduk(produkDao .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdProdukRuangRapat")))); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java index 6360b428..a6579fb3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianRumahDukaServiceImpl.java @@ -188,7 +188,7 @@ public class PemakaianRumahDukaServiceImpl extends BaseVoServiceImpl implements if (CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan().getProduk())) { orderPelayanan.setProduk( produkConverter.transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java index 42cb67c7..c8d675bb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java @@ -139,7 +139,7 @@ public class PemulasaraanJenazahServiceImpl extends BaseVoServiceImpl implements orderPelayanan.setQtyProduk(listOrderPelayanan.get(i).getQtyProduk()); orderPelayanan.setQtyProdukRetur(listOrderPelayanan.get(i).getQtyProdukRetur()); orderPelayanan.setTglPelayanan(DateUtil.getShortDate()); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaAsramaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaAsramaServiceImpl.java index c864fa0a..fb315dd5 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaAsramaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaAsramaServiceImpl.java @@ -195,7 +195,7 @@ public class SewaAsramaServiceImpl extends BaseVoServiceImpl implements SewaAsra if (CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan().getProduk())) { orderPelayanan.setProduk( produkConverter.transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaLahanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaLahanServiceImpl.java index 9f69a23b..eb843724 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaLahanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SewaLahanServiceImpl.java @@ -142,7 +142,7 @@ public class SewaLahanServiceImpl extends BaseVoServiceImpl implements SewaLahan if (CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan().getProduk())) { orderPelayanan.setProduk( produkConverter.transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); - orderPelayanan.getProduk().setNilaiNormal((byte) 1); + orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setqProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); orderPelayanan.getProduk().setQtySatuKemasan(1); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java index cace6700..25d4646a 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java @@ -343,7 +343,7 @@ public class Produk extends BaseMasterProduk { @Caption(value = "Nilai Normal") @Column(name = "NilaiNormal", nullable = true) - private short nilaiNormal; + private Short nilaiNormal; @Caption(value = "QProduk") @Column(name = "QProduk", nullable = true) @@ -713,11 +713,11 @@ public class Produk extends BaseMasterProduk { this.namaProduk = namaProduk; } - public short getNilaiNormal() { + public Short getNilaiNormal() { return nilaiNormal; } - public void setNilaiNormal(short nilaiNormal) { + public void setNilaiNormal(Short nilaiNormal) { this.nilaiNormal = nilaiNormal; }