Update mapping harga dan kelas

Clean code
This commit is contained in:
Salman Manoe 2023-09-19 16:50:09 +07:00
parent e1b5d14a0a
commit 364154ac63
3 changed files with 12 additions and 39 deletions

View File

@ -1,16 +1,14 @@
package com.jasamedika.medifirst2000.dao; package com.jasamedika.medifirst2000.dao;
import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas; import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Repository("HargaNettoProdukByKelasDao") public interface HargaNettoProdukByKelasDao extends JpaRepository<HargaNettoProdukByKelas, Integer> {
public interface HargaNettoProdukByKelasDao extends PagingAndSortingRepository<HargaNettoProdukByKelas, Integer> {
@Query("select model from HargaNettoProdukByKelas model where model.produk.id=:produkId and model.kelas.id=:kelasId " @Query("select model from HargaNettoProdukByKelas model where model.produk.id=:produkId and model.kelas.id=:kelasId "
+ "and model.asalProduk.id=:asalProdukId and model.jenisTarif.id=:jenisTarifId") + "and model.asalProduk.id=:asalProdukId and model.jenisTarif.id=:jenisTarifId")
List<HargaNettoProdukByKelas> findProdByKelas(@Param("produkId") Integer produkId, List<HargaNettoProdukByKelas> findProdByKelas(@Param("produkId") Integer produkId,

View File

@ -9,6 +9,9 @@ import javax.persistence.*;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import static javax.persistence.FetchType.LAZY;
import static javax.persistence.GenerationType.SEQUENCE;
/** /**
* class HargaNettoProdukByKelas * class HargaNettoProdukByKelas
* *
@ -56,49 +59,44 @@ public class HargaNettoProdukByKelas extends BaseMaster {
@Caption(value = "Harga Satuan") @Caption(value = "Harga Satuan")
private Double hargaSatuan; private Double hargaSatuan;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectAsalProdukFk") @JoinColumn(name = "ObjectAsalProdukFk")
@NotNull(message = "Kd Asal Produk tidak boleh kosong") @NotNull(message = "Kd Asal Produk tidak boleh kosong")
@Caption(value = "Object Asal Produk") @Caption(value = "Object Asal Produk")
private AsalProduk asalProduk; private AsalProduk asalProduk;
@Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false) @Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false)
private Integer asalProdukId; private Integer asalProdukId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectJenisTarifFk") @JoinColumn(name = "ObjectJenisTarifFk")
@NotNull(message = "Kd Jenis Tarif tidak boleh kosong") @NotNull(message = "Kd Jenis Tarif tidak boleh kosong")
@Caption(value = "Object Jenis Tarif") @Caption(value = "Object Jenis Tarif")
private JenisTarif jenisTarif; private JenisTarif jenisTarif;
@Column(name = "ObjectJenisTarifFk", insertable = false, updatable = false, nullable = false) @Column(name = "ObjectJenisTarifFk", insertable = false, updatable = false, nullable = false)
private Integer jenisTarifId; private Integer jenisTarifId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectKelasFk") @JoinColumn(name = "ObjectKelasFk")
@NotNull(message = "Kd Kelas tidak boleh kosong") @NotNull(message = "Kd Kelas tidak boleh kosong")
@Caption(value = "Object Kelas") @Caption(value = "Object Kelas")
private Kelas kelas; private Kelas kelas;
@Column(name = "ObjectKelasFk", insertable = false, updatable = false, nullable = false) @Column(name = "ObjectKelasFk", insertable = false, updatable = false, nullable = false)
private Integer kelasId; private Integer kelasId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectMataUangFk") @JoinColumn(name = "ObjectMataUangFk")
@Caption(value = "Object Mata Uang") @Caption(value = "Object Mata Uang")
private MataUang mataUang; private MataUang mataUang;
@Column(name = "ObjectMataUangFk", insertable = false, updatable = false, nullable = false) @Column(name = "ObjectMataUangFk", insertable = false, updatable = false, nullable = false)
private Integer mataUangId; private Integer mataUangId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectProdukFk") @JoinColumn(name = "ObjectProdukFk")
@NotNull(message = "Kd Produk tidak boleh kosong") @NotNull(message = "Kd Produk tidak boleh kosong")
@Caption(value = "Object Produk") @Caption(value = "Object Produk")
private Produk produk; private Produk produk;
@ -128,8 +126,8 @@ public class HargaNettoProdukByKelas extends BaseMaster {
private Date tglKadaluarsaLast; private Date tglKadaluarsaLast;
@Id @Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.harganettoprodukbykelas_m_id_seq") @GeneratedValue(strategy = SEQUENCE, generator = "public.harganettoprodukbykelas_m_id_seq")
@javax.persistence.SequenceGenerator(name = "public.harganettoprodukbykelas_m_id_seq", sequenceName = "public.harganettoprodukbykelas_m_id_seq", allocationSize = 1) @SequenceGenerator(name = "public.harganettoprodukbykelas_m_id_seq", sequenceName = "public.harganettoprodukbykelas_m_id_seq", allocationSize = 1)
@Column(name = "id") @Column(name = "id")
protected Integer id; protected Integer id;
} }

View File

@ -5,10 +5,6 @@ import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.persistence.Column;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
/** /**
@ -34,48 +30,29 @@ public class HargaNettoProdukByKelasVO extends BaseMasterVO {
@Caption(value = "Harga Satuan") @Caption(value = "Harga Satuan")
private Double hargaSatuan; private Double hargaSatuan;
@ManyToOne
@JoinColumn(name = "ObjectAsalProdukFk")
@NotNull(message = "Object Asal ProdukVO Harus Diisi")
@Caption(value = "Object Asal Produk") @Caption(value = "Object Asal Produk")
private AsalProdukVO asalProduk; private AsalProdukVO asalProduk;
@Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false)
private Integer asalProdukId; private Integer asalProdukId;
@ManyToOne
@JoinColumn(name = "ObjectJenisTarifFk")
@NotNull(message = "Object Jenis Tarif Harus Diisi")
@Caption(value = "Object Jenis Tarif") @Caption(value = "Object Jenis Tarif")
private JenisTarifVO jenisTarif; private JenisTarifVO jenisTarif;
@Column(name = "ObjectJenisTarifFk", insertable = false, updatable = false)
private Integer jenisTarifId; private Integer jenisTarifId;
@ManyToOne
@JoinColumn(name = "ObjectKelasFk")
@NotNull(message = "Object KelasVO Harus Diisi")
@Caption(value = "Object Kelas") @Caption(value = "Object Kelas")
private KelasVO kelas; private KelasVO kelas;
@Column(name = "ObjectKelasFk", insertable = false, updatable = false)
private Integer kelasId; private Integer kelasId;
@ManyToOne
@JoinColumn(name = "ObjectMataUangFk")
@Caption(value = "Object Mata Uang") @Caption(value = "Object Mata Uang")
private MataUangVO mataUang; private MataUangVO mataUang;
@Column(name = "ObjectMataUangFk", insertable = false, updatable = false)
private Integer mataUangId; private Integer mataUangId;
@ManyToOne
@JoinColumn(name = "ObjectProdukFk")
@NotNull(message = "Object ProdukVO Harus Diisi")
@Caption(value = "Object Produk") @Caption(value = "Object Produk")
private ProdukVO produk; private ProdukVO produk;
@Column(name = "ObjectProdukFk", insertable = false, updatable = false)
private Integer produkId; private Integer produkId;
@Caption(value = "Persen Discount") @Caption(value = "Persen Discount")