Update service jatah cuti dan izin
Penerapan cuti tahunan di cuti bersama tidak memengaruhi jata cuti bersama yang bisa ditangguhkan
This commit is contained in:
Salman Manoe
parent
d9b22ad720
commit
02c5f250f3
@ -1,16 +1,16 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.jasamedika.medifirst2000.dto.HariLiburTerpakai;
|
||||
import com.jasamedika.medifirst2000.entities.ListTanggalCuti;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.PagingAndSortingRepository;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.jasamedika.medifirst2000.entities.ListTanggalCuti;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Repository("ListTanggalCutiDao")
|
||||
public interface ListTanggalCutiDao extends PagingAndSortingRepository<ListTanggalCuti, String> {
|
||||
@ -62,4 +62,17 @@ public interface ListTanggalCutiDao extends PagingAndSortingRepository<ListTangg
|
||||
@Param("idJenisPermohonan") Integer idJenisPermohonan, @Param("tglAwal") Date tglAwal,
|
||||
@Param("tglAkhir") Date tglAkhir);
|
||||
|
||||
@Query("select distinct new com.jasamedika.medifirst2000.dto.HariLiburTerpakai("
|
||||
+ "pg.id as idPegawai, pg.namaLengkap as namaLengkap, " + "kl.tanggal as tanggal, "
|
||||
+ "khl.isCutiBersamaDitangguhkan as isCBDitangguhkan) "
|
||||
+ "from ListTanggalCuti ltc, Kalender kl, MapKalenderToHariLibur khl "
|
||||
+ "inner join ltc.planningPegawaiStatus pps inner join pps.pegawai pg "
|
||||
+ "where cast(ltc.tgl as date) = cast(kl.tanggal as date) " + "and kl.id = khl.tanggalId "
|
||||
+ "and ltc.statusEnabled is true " + "and pps.statusEnabled is true " + "and pps.noSkId is not null "
|
||||
+ "and pps.statusPegawaiPlanId = 1 " + "and pg.id = :idPegawai " + "and khl.hariLiburId = :idHariLibur "
|
||||
+ "and ltc.tgl between :tglAwal and :tglAkhir")
|
||||
List<HariLiburTerpakai> getCutiByTahun(@Param("idPegawai") Integer idPegawai,
|
||||
@Param("idHariLibur") Integer idHariLibur, @Param("tglAwal") Date tglAwal,
|
||||
@Param("tglAkhir") Date tglAkhir);
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.jasamedika.medifirst2000.dao;
|
||||
|
||||
import com.jasamedika.medifirst2000.dto.PresensiHariLibur;
|
||||
import com.jasamedika.medifirst2000.dto.HariLiburTerpakai;
|
||||
import com.jasamedika.medifirst2000.entities.Kalender;
|
||||
import com.jasamedika.medifirst2000.entities.MapKalenderToHariLibur;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
@ -38,14 +38,14 @@ public interface MapKalenderToHariLiburDao extends PagingAndSortingRepository<Ma
|
||||
+ "and to_char(kalender.tanggal,'yyyy')>=:tahun")
|
||||
List<Map<String, Object>> getMappingHariLibur(@Param("tahun") String tahun);
|
||||
|
||||
@Query("select distinct new com.jasamedika.medifirst2000.dto.PresensiHariLibur("
|
||||
@Query("select distinct new com.jasamedika.medifirst2000.dto.HariLiburTerpakai("
|
||||
+ "pg.id as idPegawai, pg.namaLengkap as namaLengkap, " + "kld.tanggal as tanggal, "
|
||||
+ "mkl.isCutiBersamaDitangguhkan as isCBDitangguhkan) "
|
||||
+ "from Pegawai pg, Habsen hab, MapKalenderToHariLibur mkl " + "inner join mkl.tanggal kld "
|
||||
+ "where pg.id = :idPegawai " + "and pg.idFinger = hab.empl_code "
|
||||
+ "and cast(hab.tr_date as date) = kld.tanggal " + "and mkl.hariLiburId = :idHariLibur "
|
||||
+ "and kld.tanggal between :tglAwal and :tglAkhir")
|
||||
List<PresensiHariLibur> getPresensiByTahun(@Param("idPegawai") Integer idPegawai,
|
||||
List<HariLiburTerpakai> getPresensiByTahun(@Param("idPegawai") Integer idPegawai,
|
||||
@Param("idHariLibur") Integer idHariLibur, @Param("tglAwal") Date tglAwal,
|
||||
@Param("tglAkhir") Date tglAkhir);
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import com.jasamedika.medifirst2000.constants.Master;
|
||||
import com.jasamedika.medifirst2000.dao.*;
|
||||
import com.jasamedika.medifirst2000.dto.DataCutiDto;
|
||||
import com.jasamedika.medifirst2000.dto.JatahCutiRequest;
|
||||
import com.jasamedika.medifirst2000.dto.PresensiHariLibur;
|
||||
import com.jasamedika.medifirst2000.dto.HariLiburTerpakai;
|
||||
import com.jasamedika.medifirst2000.entities.ListTanggalCuti;
|
||||
import com.jasamedika.medifirst2000.service.JatahCutiDanIzinService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
@ -558,19 +558,25 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
|
||||
Date tahunLalu = DateUtil.getInstanceCalendar(-1);
|
||||
Date awalTahunLalu = DateUtil.startYear(tahunLalu);
|
||||
Date akhirTahunLalu = DateUtil.endYear(tahunLalu);
|
||||
List<PresensiHariLibur> listPresensiTahunLalu = mapKalenderToHariLiburDao
|
||||
List<HariLiburTerpakai> listPresensiTahunLalu = mapKalenderToHariLiburDao
|
||||
.getPresensiByTahun(request.getPegawaiId(), LIBUR_CB, awalTahunLalu, akhirTahunLalu);
|
||||
List<PresensiHariLibur> listPresensiCutiBersamaBisaDitangguhkan = listPresensiTahunLalu.stream()
|
||||
.filter(PresensiHariLibur::getIsCutiBersamaDitangguhkan).collect(Collectors.toList());
|
||||
List<HariLiburTerpakai> listPresensiCutiBersamaBisaDitangguhkan = listPresensiTahunLalu.stream()
|
||||
.filter(HariLiburTerpakai::getIsCutiBersamaDitangguhkan).collect(Collectors.toList());
|
||||
if (listPresensiCutiBersamaBisaDitangguhkan.isEmpty())
|
||||
return dto;
|
||||
List<HariLiburTerpakai> listCutiDiCutiBersamaTahunLalu = tanggalCutiDao.getCutiByTahun(request.getPegawaiId(),
|
||||
LIBUR_CB, awalTahunLalu, akhirTahunLalu);
|
||||
if (DateUtil.getYear(new Date()) == Integer.parseInt(request.getYear())) {
|
||||
List<ListTanggalCuti> listCutiTahunLaluBelumDisetujui = tanggalCutiDao
|
||||
.notApprovedByPermohonan(request.getPegawaiId(), CUTI_TAHUNAN, awalTahunLalu, akhirTahunLalu);
|
||||
int presensiCutiBersama = listPresensiTahunLalu.size();
|
||||
int jatahDitangguhkan = listPresensiCutiBersamaBisaDitangguhkan.size();
|
||||
if (presensiCutiBersama - dto.getCutiTerpakaiB1()
|
||||
- listCutiTahunLaluBelumDisetujui.size() >= jatahDitangguhkan) {
|
||||
int cutiDiCutiBersama = listCutiDiCutiBersamaTahunLalu.size();
|
||||
int sisaJatah = presensiCutiBersama + cutiDiCutiBersama - dto.getCutiTerpakaiB1();
|
||||
int jatahDitangguhkan = listPresensiCutiBersamaBisaDitangguhkan.size()
|
||||
- listCutiTahunLaluBelumDisetujui.size();
|
||||
if (jatahDitangguhkan >= sisaJatah) {
|
||||
if (jatahDitangguhkan < 0)
|
||||
jatahDitangguhkan = 0;
|
||||
dto.setDataCutiB(dto.getDataCutiB() + jatahDitangguhkan);
|
||||
dto.setSisaCutiB(dto.getDataCutiB() - dto.getCutiTerpakaiB());
|
||||
}
|
||||
|
||||
@ -1,29 +1,27 @@
|
||||
package com.jasamedika.medifirst2000.service.impl;
|
||||
|
||||
import com.jasamedika.medifirst2000.constants.Master;
|
||||
import com.jasamedika.medifirst2000.dao.KalenderDao;
|
||||
import com.jasamedika.medifirst2000.entities.Kalender;
|
||||
import com.jasamedika.medifirst2000.service.KalenderService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.jasamedika.medifirst2000.constants.Master;
|
||||
import com.jasamedika.medifirst2000.dao.KalenderDao;
|
||||
import com.jasamedika.medifirst2000.entities.Kalender;
|
||||
import com.jasamedika.medifirst2000.service.KalenderService;
|
||||
|
||||
@Service("kalenderService")
|
||||
public class KalenderServiceImpl extends BaseVoServiceImpl implements KalenderService {
|
||||
|
||||
|
||||
@Autowired
|
||||
KalenderDao kalenderDao;
|
||||
|
||||
@Override
|
||||
public void generateAndSaveKalender() {
|
||||
List<Kalender> kals = new ArrayList<Kalender>();
|
||||
|
||||
List<Kalender> kals = new ArrayList<>();
|
||||
Calendar ct = Calendar.getInstance();
|
||||
ct.set(Calendar.MONTH, 0);
|
||||
ct.set(Calendar.DAY_OF_MONTH, 1);
|
||||
@ -32,20 +30,15 @@ public class KalenderServiceImpl extends BaseVoServiceImpl implements KalenderSe
|
||||
ct.set(Calendar.SECOND, 0);
|
||||
ct.set(Calendar.MILLISECOND, 0);
|
||||
ct.add(Calendar.YEAR, 1);
|
||||
|
||||
Calendar c = Calendar.getInstance();
|
||||
Date lastDate = kalenderDao.getLastDateData();
|
||||
c.setTime(lastDate);
|
||||
c.add(Calendar.DATE, 1);
|
||||
|
||||
if (ct.getTime().compareTo(c.getTime()) == 0) {
|
||||
int daysInYear = c.getActualMaximum(Calendar.DAY_OF_YEAR);
|
||||
|
||||
for (int i = 1; i <= daysInYear; i++) {
|
||||
c.set(Calendar.DAY_OF_YEAR, i);
|
||||
|
||||
Kalender kal = new Kalender();
|
||||
|
||||
kal.setKdProfile((short) 0);
|
||||
kal.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
|
||||
kal.setBulanKeDlmTahun((byte) (c.get(Calendar.MONTH) + 1));
|
||||
@ -55,15 +48,13 @@ public class KalenderServiceImpl extends BaseVoServiceImpl implements KalenderSe
|
||||
kal.setKdTanggal(c.get(Calendar.DAY_OF_YEAR));
|
||||
kal.setNamaBulan(new SimpleDateFormat("MMMM", new java.util.Locale("id")).format(c.getTime()));
|
||||
kal.setNamaHari(new SimpleDateFormat("EEEE", new java.util.Locale("id")).format(c.getTime()));
|
||||
kal.setqTanggal(c.get(Calendar.DAY_OF_YEAR));
|
||||
kal.setQTanggal(c.get(Calendar.DAY_OF_YEAR));
|
||||
kal.setTahunKalender((short) c.get(Calendar.YEAR));
|
||||
kal.setTanggal(c.getTime());
|
||||
|
||||
kals.add(kal);
|
||||
}
|
||||
kalenderDao.save(kals);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ import java.util.Date;
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class PresensiHariLibur {
|
||||
public class HariLiburTerpakai {
|
||||
|
||||
private Integer idPegawai;
|
||||
|
||||
@ -1,407 +1,125 @@
|
||||
package com.jasamedika.medifirst2000.entities;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.Table;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.BaseMaster;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
import static javax.persistence.GenerationType.SEQUENCE;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "Kalender_S")
|
||||
public class Kalender extends BaseMaster {
|
||||
|
||||
@Column(name = "BulanFiscal", nullable = true , length = 10)
|
||||
@Caption(value="Bulan Fiscal")
|
||||
|
||||
@Column(name = "BulanFiscal", length = 10)
|
||||
@Caption(value = "Bulan Fiscal")
|
||||
private String bulanFiscal;
|
||||
|
||||
@NotNull(message="Bulan Ke Dlm Tahun tidak boleh kosong")
|
||||
@Column(name = "BulanKeDlmTahun", nullable = false )
|
||||
@Caption(value="Bulan Ke Dlm Tahun")
|
||||
@NotNull(message = "Bulan Ke Dlm Tahun tidak boleh kosong")
|
||||
@Column(name = "BulanKeDlmTahun", nullable = false)
|
||||
@Caption(value = "Bulan Ke Dlm Tahun")
|
||||
private Byte bulanKeDlmTahun;
|
||||
|
||||
@NotNull(message="Hari Ke Dlm Bulan tidak boleh kosong")
|
||||
@Column(name = "HariKeDlmBulan", nullable = false )
|
||||
@Caption(value="Hari Ke Dlm Bulan")
|
||||
@NotNull(message = "Hari Ke Dlm Bulan tidak boleh kosong")
|
||||
@Column(name = "HariKeDlmBulan", nullable = false)
|
||||
@Caption(value = "Hari Ke Dlm Bulan")
|
||||
private Byte hariKeDlmBulan;
|
||||
|
||||
@NotNull(message="Hari Ke Dlm Minggu tidak boleh kosong")
|
||||
@Column(name = "HariKeDlmMinggu", nullable = false )
|
||||
@Caption(value="Hari Ke Dlm Minggu")
|
||||
@NotNull(message = "Hari Ke Dlm Minggu tidak boleh kosong")
|
||||
@Column(name = "HariKeDlmMinggu", nullable = false)
|
||||
@Caption(value = "Hari Ke Dlm Minggu")
|
||||
private Byte hariKeDlmMinggu;
|
||||
|
||||
@NotNull(message="Hari Ke Dlm Tahun tidak boleh kosong")
|
||||
@Column(name = "HariKeDlmTahun", nullable = false )
|
||||
@Caption(value="Hari Ke Dlm Tahun")
|
||||
@NotNull(message = "Hari Ke Dlm Tahun tidak boleh kosong")
|
||||
@Column(name = "HariKeDlmTahun", nullable = false)
|
||||
@Caption(value = "Hari Ke Dlm Tahun")
|
||||
private Short hariKeDlmTahun;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectHistoryLoginDFk")
|
||||
@Caption(value="Object History Login D")
|
||||
@Caption(value = "Object History Login D")
|
||||
private HistoryLoginModulAplikasi historyLoginD;
|
||||
|
||||
@Column(name = "ObjectHistoryLoginDFk", insertable=false,updatable=false)
|
||||
@Column(name = "ObjectHistoryLoginDFk", insertable = false, updatable = false)
|
||||
private Integer historyLoginDId;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectHistoryLoginIFk")
|
||||
@NotNull(message="Kd History Login I tidak boleh kosong")
|
||||
@Caption(value="Object History Login I")
|
||||
@NotNull(message = "Kd History Login I tidak boleh kosong")
|
||||
@Caption(value = "Object History Login I")
|
||||
private HistoryLoginModulAplikasi historyLoginI;
|
||||
|
||||
@Column(name = "ObjectHistoryLoginIFk", insertable=false,updatable=false)
|
||||
@Column(name = "ObjectHistoryLoginIFk", insertable = false, updatable = false)
|
||||
private Integer historyLoginIId;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectHistoryLoginSFk")
|
||||
@Caption(value="Object History Login S")
|
||||
@Caption(value = "Object History Login S")
|
||||
private HistoryLoginModulAplikasi historyLoginS;
|
||||
|
||||
@Column(name = "ObjectHistoryLoginSFk", insertable=false,updatable=false,nullable=false)
|
||||
@Column(name = "ObjectHistoryLoginSFk", insertable = false, updatable = false, nullable = false)
|
||||
private Integer historyLoginSId;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "ObjectHistoryLoginUFk")
|
||||
@Caption(value="Object History Login U")
|
||||
@Caption(value = "Object History Login U")
|
||||
private HistoryLoginModulAplikasi historyLoginU;
|
||||
|
||||
@Column(name = "ObjectHistoryLoginUFk", insertable=false,updatable=false)
|
||||
@Column(name = "ObjectHistoryLoginUFk", insertable = false, updatable = false)
|
||||
private Integer historyLoginUId;
|
||||
|
||||
@NotNull(message="Kd Tanggal tidak boleh kosong")
|
||||
@Column(name = "KdTanggal", nullable = false )
|
||||
@Caption(value="Kode Tanggal")
|
||||
@NotNull(message = "Kd Tanggal tidak boleh kosong")
|
||||
@Column(name = "KdTanggal", nullable = false)
|
||||
@Caption(value = "Kode Tanggal")
|
||||
private Integer kdTanggal;
|
||||
|
||||
@NotNull(message="Nama Bulan tidak boleh kosong")
|
||||
@Column(name = "NamaBulan", nullable = false , length = 10)
|
||||
@Caption(value="Nama Bulan")
|
||||
@NotNull(message = "Nama Bulan tidak boleh kosong")
|
||||
@Column(name = "NamaBulan", nullable = false, length = 10)
|
||||
@Caption(value = "Nama Bulan")
|
||||
private String namaBulan;
|
||||
|
||||
@NotNull(message="Nama Hari tidak boleh kosong")
|
||||
@Column(name = "NamaHari", nullable = false , length = 10)
|
||||
@Caption(value="Nama Hari")
|
||||
@NotNull(message = "Nama Hari tidak boleh kosong")
|
||||
@Column(name = "NamaHari", nullable = false, length = 10)
|
||||
@Caption(value = "Nama Hari")
|
||||
private String namaHari;
|
||||
|
||||
@NotNull(message="QTanggal tidak boleh kosong")
|
||||
@Column(name = "QTanggal", nullable = false )
|
||||
@Caption(value="QTanggal")
|
||||
@NotNull(message = "QTanggal tidak boleh kosong")
|
||||
@Column(name = "QTanggal", nullable = false)
|
||||
@Caption(value = "QTanggal")
|
||||
private Integer qTanggal;
|
||||
|
||||
@Column(name = "SemesterKeDlmTahun", nullable = true )
|
||||
@Caption(value="Semester Ke Dlm Tahun")
|
||||
@Column(name = "SemesterKeDlmTahun")
|
||||
@Caption(value = "Semester Ke Dlm Tahun")
|
||||
private Byte semesterKeDlmTahun;
|
||||
|
||||
@Column(name = "TahunFiscal", nullable = true )
|
||||
@Caption(value="Tahun Fiscal")
|
||||
@Column(name = "TahunFiscal")
|
||||
@Caption(value = "Tahun Fiscal")
|
||||
private Short tahunFiscal;
|
||||
|
||||
@NotNull(message="Tahun Kalender tidak boleh kosong")
|
||||
@Column(name = "TahunKalender", nullable = false )
|
||||
@Caption(value="Tahun Kalender")
|
||||
@NotNull(message = "Tahun Kalender tidak boleh kosong")
|
||||
@Column(name = "TahunKalender", nullable = false)
|
||||
@Caption(value = "Tahun Kalender")
|
||||
private Short tahunKalender;
|
||||
|
||||
@NotNull(message="Tanggal tidak boleh kosong")
|
||||
@Column(name = "Tanggal", nullable = false )
|
||||
@Caption(value="Tanggal")
|
||||
@NotNull(message = "Tanggal tidak boleh kosong")
|
||||
@Column(name = "Tanggal", nullable = false)
|
||||
@Caption(value = "Tanggal")
|
||||
private Date tanggal;
|
||||
|
||||
@Column(name = "TriwulanKeDlmTahun", nullable = true )
|
||||
@Caption(value="Triwulan Ke Dlm Tahun")
|
||||
@Column(name = "TriwulanKeDlmTahun")
|
||||
@Caption(value = "Triwulan Ke Dlm Tahun")
|
||||
private Byte triwulanKeDlmTahun;
|
||||
|
||||
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.kalender_m_id_seq")
|
||||
@javax.persistence.SequenceGenerator(name = "public.kalender_m_id_seq", sequenceName = "public.kalender_m_id_seq", allocationSize = 1)
|
||||
@GeneratedValue(strategy = SEQUENCE, generator = "public.kalender_m_id_seq")
|
||||
@SequenceGenerator(name = "public.kalender_m_id_seq", sequenceName = "public.kalender_m_id_seq", allocationSize = 1)
|
||||
@Column(name = "id")
|
||||
protected Integer id;
|
||||
|
||||
|
||||
|
||||
public String getBulanFiscal() {
|
||||
return bulanFiscal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setBulanFiscal(String bulanFiscal) {
|
||||
this.bulanFiscal = bulanFiscal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Byte getBulanKeDlmTahun() {
|
||||
return bulanKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setBulanKeDlmTahun(Byte bulanKeDlmTahun) {
|
||||
this.bulanKeDlmTahun = bulanKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Byte getHariKeDlmBulan() {
|
||||
return hariKeDlmBulan;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHariKeDlmBulan(Byte hariKeDlmBulan) {
|
||||
this.hariKeDlmBulan = hariKeDlmBulan;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Byte getHariKeDlmMinggu() {
|
||||
return hariKeDlmMinggu;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHariKeDlmMinggu(Byte hariKeDlmMinggu) {
|
||||
this.hariKeDlmMinggu = hariKeDlmMinggu;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Short getHariKeDlmTahun() {
|
||||
return hariKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHariKeDlmTahun(Short hariKeDlmTahun) {
|
||||
this.hariKeDlmTahun = hariKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public HistoryLoginModulAplikasi getHistoryLoginD() {
|
||||
return historyLoginD;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginD(HistoryLoginModulAplikasi historyLoginD) {
|
||||
this.historyLoginD = historyLoginD;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getHistoryLoginDId() {
|
||||
return historyLoginDId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginDId(Integer historyLoginDId) {
|
||||
this.historyLoginDId = historyLoginDId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public HistoryLoginModulAplikasi getHistoryLoginI() {
|
||||
return historyLoginI;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginI(HistoryLoginModulAplikasi historyLoginI) {
|
||||
this.historyLoginI = historyLoginI;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getHistoryLoginIId() {
|
||||
return historyLoginIId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginIId(Integer historyLoginIId) {
|
||||
this.historyLoginIId = historyLoginIId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public HistoryLoginModulAplikasi getHistoryLoginS() {
|
||||
return historyLoginS;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginS(HistoryLoginModulAplikasi historyLoginS) {
|
||||
this.historyLoginS = historyLoginS;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getHistoryLoginSId() {
|
||||
return historyLoginSId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginSId(Integer historyLoginSId) {
|
||||
this.historyLoginSId = historyLoginSId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public HistoryLoginModulAplikasi getHistoryLoginU() {
|
||||
return historyLoginU;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginU(HistoryLoginModulAplikasi historyLoginU) {
|
||||
this.historyLoginU = historyLoginU;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getHistoryLoginUId() {
|
||||
return historyLoginUId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setHistoryLoginUId(Integer historyLoginUId) {
|
||||
this.historyLoginUId = historyLoginUId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getKdTanggal() {
|
||||
return kdTanggal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setKdTanggal(Integer kdTanggal) {
|
||||
this.kdTanggal = kdTanggal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getNamaBulan() {
|
||||
return namaBulan;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setNamaBulan(String namaBulan) {
|
||||
this.namaBulan = namaBulan;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getNamaHari() {
|
||||
return namaHari;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setNamaHari(String namaHari) {
|
||||
this.namaHari = namaHari;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getqTanggal() {
|
||||
return qTanggal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setqTanggal(Integer qTanggal) {
|
||||
this.qTanggal = qTanggal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Byte getSemesterKeDlmTahun() {
|
||||
return semesterKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setSemesterKeDlmTahun(Byte semesterKeDlmTahun) {
|
||||
this.semesterKeDlmTahun = semesterKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Short getTahunFiscal() {
|
||||
return tahunFiscal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setTahunFiscal(Short tahunFiscal) {
|
||||
this.tahunFiscal = tahunFiscal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Short getTahunKalender() {
|
||||
return tahunKalender;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setTahunKalender(Short tahunKalender) {
|
||||
this.tahunKalender = tahunKalender;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Date getTanggal() {
|
||||
return tanggal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setTanggal(Date tanggal) {
|
||||
this.tanggal = tanggal;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Byte getTriwulanKeDlmTahun() {
|
||||
return triwulanKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setTriwulanKeDlmTahun(Byte triwulanKeDlmTahun) {
|
||||
this.triwulanKeDlmTahun = triwulanKeDlmTahun;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,209 +1,68 @@
|
||||
package com.jasamedika.medifirst2000.vo;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
|
||||
import com.jasamedika.medifirst2000.helper.Caption;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class KalenderVO extends BaseMasterVO {
|
||||
|
||||
@Caption(value="Bulan Fiscal")
|
||||
|
||||
@Caption(value = "Bulan Fiscal")
|
||||
private String bulanFiscal;
|
||||
|
||||
@Caption(value="Bulan Ke Dlm Tahun")
|
||||
@Caption(value = "Bulan Ke Dlm Tahun")
|
||||
private Byte bulanKeDlmTahun;
|
||||
|
||||
@Caption(value="Hari Ke Dlm Bulan")
|
||||
@Caption(value = "Hari Ke Dlm Bulan")
|
||||
private Byte hariKeDlmBulan;
|
||||
|
||||
@Caption(value="Hari Ke Dlm Minggu")
|
||||
@Caption(value = "Hari Ke Dlm Minggu")
|
||||
private Byte hariKeDlmMinggu;
|
||||
|
||||
@Caption(value="Hari Ke Dlm Tahun")
|
||||
@Caption(value = "Hari Ke Dlm Tahun")
|
||||
private short hariKeDlmTahun;
|
||||
|
||||
@Caption(value="Object History Login D")
|
||||
@Caption(value = "Object History Login D")
|
||||
private HistoryLoginModulAplikasiVO historyLoginD;
|
||||
|
||||
@Caption(value="Object History Login I")
|
||||
@Caption(value = "Object History Login I")
|
||||
private HistoryLoginModulAplikasiVO historyLoginI;
|
||||
|
||||
@Caption(value="Object History Login S")
|
||||
@Caption(value = "Object History Login S")
|
||||
private HistoryLoginModulAplikasiVO historyLoginS;
|
||||
|
||||
@Caption(value="Object History Login U")
|
||||
@Caption(value = "Object History Login U")
|
||||
private HistoryLoginModulAplikasiVO historyLoginU;
|
||||
|
||||
@Caption(value="Kode Tanggal")
|
||||
@Caption(value = "Kode Tanggal")
|
||||
private Integer kdTanggal;
|
||||
|
||||
@Caption(value="Nama Bulan")
|
||||
@Caption(value = "Nama Bulan")
|
||||
private String namaBulan;
|
||||
|
||||
@Caption(value="Nama Hari")
|
||||
@Caption(value = "Nama Hari")
|
||||
private String namaHari;
|
||||
|
||||
@Caption(value="QTanggal")
|
||||
@Caption(value = "QTanggal")
|
||||
private Integer qTanggal;
|
||||
|
||||
@Caption(value="Semester Ke Dlm Tahun")
|
||||
@Caption(value = "Semester Ke Dlm Tahun")
|
||||
private Byte semesterKeDlmTahun;
|
||||
|
||||
@Caption(value="Tahun Fiscal")
|
||||
@Caption(value = "Tahun Fiscal")
|
||||
private short tahunFiscal;
|
||||
|
||||
@Caption(value="Tahun Kalender")
|
||||
@Caption(value = "Tahun Kalender")
|
||||
private short tahunKalender;
|
||||
|
||||
@Caption(value="Tanggal")
|
||||
@Caption(value = "Tanggal")
|
||||
private Date tanggal;
|
||||
|
||||
@Caption(value="Triwulan Ke Dlm Tahun")
|
||||
@Caption(value = "Triwulan Ke Dlm Tahun")
|
||||
private Byte triwulanKeDlmTahun;
|
||||
|
||||
public String getBulanFiscal() {
|
||||
return bulanFiscal;
|
||||
}
|
||||
|
||||
public void setBulanFiscal(String bulanFiscal) {
|
||||
this.bulanFiscal = bulanFiscal;
|
||||
}
|
||||
|
||||
public Byte getBulanKeDlmTahun() {
|
||||
return bulanKeDlmTahun;
|
||||
}
|
||||
|
||||
public void setBulanKeDlmTahun(Byte bulanKeDlmTahun) {
|
||||
this.bulanKeDlmTahun = bulanKeDlmTahun;
|
||||
}
|
||||
|
||||
public Byte getHariKeDlmBulan() {
|
||||
return hariKeDlmBulan;
|
||||
}
|
||||
|
||||
public void setHariKeDlmBulan(Byte hariKeDlmBulan) {
|
||||
this.hariKeDlmBulan = hariKeDlmBulan;
|
||||
}
|
||||
|
||||
public Byte getHariKeDlmMinggu() {
|
||||
return hariKeDlmMinggu;
|
||||
}
|
||||
|
||||
public void setHariKeDlmMinggu(Byte hariKeDlmMinggu) {
|
||||
this.hariKeDlmMinggu = hariKeDlmMinggu;
|
||||
}
|
||||
|
||||
public short getHariKeDlmTahun() {
|
||||
return hariKeDlmTahun;
|
||||
}
|
||||
|
||||
public void setHariKeDlmTahun(short hariKeDlmTahun) {
|
||||
this.hariKeDlmTahun = hariKeDlmTahun;
|
||||
}
|
||||
|
||||
public HistoryLoginModulAplikasiVO getHistoryLoginD() {
|
||||
return historyLoginD;
|
||||
}
|
||||
|
||||
public void setHistoryLoginD(HistoryLoginModulAplikasiVO historyLoginD) {
|
||||
this.historyLoginD = historyLoginD;
|
||||
}
|
||||
|
||||
public HistoryLoginModulAplikasiVO getHistoryLoginI() {
|
||||
return historyLoginI;
|
||||
}
|
||||
|
||||
public void setHistoryLoginI(HistoryLoginModulAplikasiVO historyLoginI) {
|
||||
this.historyLoginI = historyLoginI;
|
||||
}
|
||||
|
||||
public HistoryLoginModulAplikasiVO getHistoryLoginS() {
|
||||
return historyLoginS;
|
||||
}
|
||||
|
||||
public void setHistoryLoginS(HistoryLoginModulAplikasiVO historyLoginS) {
|
||||
this.historyLoginS = historyLoginS;
|
||||
}
|
||||
|
||||
public HistoryLoginModulAplikasiVO getHistoryLoginU() {
|
||||
return historyLoginU;
|
||||
}
|
||||
|
||||
public void setHistoryLoginU(HistoryLoginModulAplikasiVO historyLoginU) {
|
||||
this.historyLoginU = historyLoginU;
|
||||
}
|
||||
|
||||
public Integer getKdTanggal() {
|
||||
return kdTanggal;
|
||||
}
|
||||
|
||||
public void setKdTanggal(Integer kdTanggal) {
|
||||
this.kdTanggal = kdTanggal;
|
||||
}
|
||||
|
||||
public String getNamaBulan() {
|
||||
return namaBulan;
|
||||
}
|
||||
|
||||
public void setNamaBulan(String namaBulan) {
|
||||
this.namaBulan = namaBulan;
|
||||
}
|
||||
|
||||
public String getNamaHari() {
|
||||
return namaHari;
|
||||
}
|
||||
|
||||
public void setNamaHari(String namaHari) {
|
||||
this.namaHari = namaHari;
|
||||
}
|
||||
|
||||
public Integer getqTanggal() {
|
||||
return qTanggal;
|
||||
}
|
||||
|
||||
public void setqTanggal(Integer qTanggal) {
|
||||
this.qTanggal = qTanggal;
|
||||
}
|
||||
|
||||
public Byte getSemesterKeDlmTahun() {
|
||||
return semesterKeDlmTahun;
|
||||
}
|
||||
|
||||
public void setSemesterKeDlmTahun(Byte semesterKeDlmTahun) {
|
||||
this.semesterKeDlmTahun = semesterKeDlmTahun;
|
||||
}
|
||||
|
||||
public short getTahunFiscal() {
|
||||
return tahunFiscal;
|
||||
}
|
||||
|
||||
public void setTahunFiscal(short tahunFiscal) {
|
||||
this.tahunFiscal = tahunFiscal;
|
||||
}
|
||||
|
||||
public short getTahunKalender() {
|
||||
return tahunKalender;
|
||||
}
|
||||
|
||||
public void setTahunKalender(short tahunKalender) {
|
||||
this.tahunKalender = tahunKalender;
|
||||
}
|
||||
|
||||
public Date getTanggal() {
|
||||
return tanggal;
|
||||
}
|
||||
|
||||
public void setTanggal(Date tanggal) {
|
||||
this.tanggal = tanggal;
|
||||
}
|
||||
|
||||
public Byte getTriwulanKeDlmTahun() {
|
||||
return triwulanKeDlmTahun;
|
||||
}
|
||||
|
||||
public void setTriwulanKeDlmTahun(Byte triwulanKeDlmTahun) {
|
||||
this.triwulanKeDlmTahun = triwulanKeDlmTahun;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user