From b70220eaceca5af6a95fb5f794df2e6bb3b3fcd9 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Thu, 4 Feb 2021 10:27:35 +0700 Subject: [PATCH] rapi-rapj --- .../medifirst2000/dao/LoginUserDao.java | 172 +++++------------- .../impl/RekamDataPegawaiServiceImpl.java | 2 +- 2 files changed, 51 insertions(+), 123 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LoginUserDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LoginUserDao.java index f1024589..fffe7ff0 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LoginUserDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LoginUserDao.java @@ -12,144 +12,72 @@ import com.jasamedika.medifirst2000.entities.LoginUser; @Repository("LoginUserDao") public interface LoginUserDao extends PagingAndSortingRepository { - - @Query("select NEW com.jasamedika.medifirst2000.entities.LoginUser( " - +" loginUser.id, " - +" loginUser.kataSandi, " - +" loginUser.kelompokUser, " - +" loginUser.namaUser, " - +" pegawai.namaLengkap, " - +" pegawai.namaPanggilan, " - +" pegawai.nikIntern, " - +" pegawai.nipPns, " - +" pegawai.noIdentitas, " - +" pegawai.npwp, " -// +" subUnitKerja.id, " -// +" subUnitKerja.name, " - +" pegawai.id, " - +" pegawai.email, " - +" ruangan.id, " - +" ruangan.namaRuangan, " - +" departemen.kdDepartemen, " - +" departemen.namaDepartemen , " - +" departemen.id ) " - +"from LoginUser loginUser " -// +"from LoginUser loginUser, MapPegawaiJabatanToUnitKerja mapPegawai " - + "left join loginUser.pegawai pegawai " -// + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " - + "left join pegawai.ruangan ruangan " - + "left join ruangan.departemen departemen " - + "where loginUser.namaUser LIKE :namaUser ") -// + "where mapPegawai.pegawaiId = pegawai.id " -// + "and mapPegawai.isPrimary is true " -// + "and loginUser.namaUser LIKE :namaUser") + + @Query("select NEW com.jasamedika.medifirst2000.entities.LoginUser( " + " loginUser.id, " + " loginUser.kataSandi, " + + " loginUser.kelompokUser, " + " loginUser.namaUser, " + " pegawai.namaLengkap, " + + " pegawai.namaPanggilan, " + " pegawai.nikIntern, " + " pegawai.nipPns, " + " pegawai.noIdentitas, " + + " pegawai.npwp, " + " pegawai.id, " + " pegawai.email, " + " ruangan.id, " + " ruangan.namaRuangan, " + + " departemen.kdDepartemen, " + " departemen.namaDepartemen , " + " departemen.id ) " + + "from LoginUser loginUser " + "left join loginUser.pegawai pegawai " + + "left join pegawai.ruangan ruangan " + "left join ruangan.departemen departemen " + + "where loginUser.namaUser LIKE :namaUser ") List findByNamaUser(@Param("namaUser") String namaUser); - + @Query("select NEW com.jasamedika.medifirst2000.entities.LoginUser(r.id, r.kelompokUser, r.namaUser,r.pegawai.namaLengkap, r.pegawai.namaPanggilan, r.pegawai.nikIntern, r.pegawai.nipPns, r.pegawai.noIdentitas,r.pegawai.npwp,r.pegawai.id,r.pegawai.email,r.pegawai.ruangan.id,r.pegawai.ruangan.namaRuangan,r.pegawai.ruangan.departemen.kdDepartemen,r.pegawai.ruangan.departemen.namaDepartemen,r.pegawai.ruangan.departemen.id) from LoginUser r ") List findAllUser(); - @Query("select NEW Map (" - + "a.id as id, " - + "a.namaLengkap as namaPegawai) " - + "from Pegawai a ") + @Query("select NEW Map (" + "a.id as id, " + "a.namaLengkap as namaPegawai) " + "from Pegawai a ") List> listPegawai(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.kelompokUser as kelompokUser) " - + "from KelompokUser a") + + @Query("select NEW Map (" + "a.id as id, " + "a.kelompokUser as kelompokUser) " + "from KelompokUser a") List> listKelompokUser(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.namaRuangan as namaRuangan," - + "b.id as departemenId) " - + "from Ruangan a " - + "left join a.departemen b") + + @Query("select NEW Map (" + "a.id as id, " + "a.namaRuangan as namaRuangan," + "b.id as departemenId) " + + "from Ruangan a " + "left join a.departemen b") List> listRuangan(); - - @Query("select distinct NEW Map (" - + "c.id as id," - + "c.modulAplikasi as modulAplikasi," - + "c.noUrut as noUrut) " - + "from MapObjekModulToDepartemen a " - + "left join a.objekModulAplikasi b " - + "left join b.modulAplikasi c " - + "left join a.departemen d " - + "where d.id=:id") - List> getModulByDepartemen( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "b.id as id," - + "b.objekModulAplikasi as objekModulAplikasi," - + "b.alamatUrlForm as alamatUrlForm) " - + "from MapObjekModulToDepartemen a " - + "left join a.objekModulAplikasi b " - + "left join b.modulAplikasi c " - + "left join b.children d " + + @Query("select distinct NEW Map (" + "c.id as id," + "c.modulAplikasi as modulAplikasi," + "c.noUrut as noUrut) " + + "from MapObjekModulToDepartemen a " + "left join a.objekModulAplikasi b " + "left join b.modulAplikasi c " + + "left join a.departemen d " + "where d.id=:id") + List> getModulByDepartemen(@Param("id") Integer id); + + @Query("select NEW Map (" + "b.id as id," + "b.objekModulAplikasi as objekModulAplikasi," + + "b.alamatUrlForm as alamatUrlForm) " + "from MapObjekModulToDepartemen a " + + "left join a.objekModulAplikasi b " + "left join b.modulAplikasi c " + "left join b.children d " + "where c.id=:id") - List> getObjectModulHeadByModul( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.id as id," - + "a.objekModulAplikasi as objekModulAplikasi," - + "a.alamatUrlForm as alamatUrlForm," - + "a.noUrut as noUrut) " - + "from ObjekModulAplikasi a " - + "left join a.children b " - + "where b.id=:id") - List> getModulByModulHead( - @Param("id") Integer id); - - //------------------------------------------------------------- - - @Query("select NEW Map (" - + "b.id as ruanganId," - + "b.namaRuangan as namaRuangan," - + "c.id as modulAplikasiId," - + "c.modulAplikasi as namaModulAplikasi," - + "c.iconImage as iconImage," - + "c.noUrut as noUrut," - + "e.id as kelompokUserId," - + "e.kelompokUser as kelompokUser) " - + "from MapLoginUserToRuangan a " - + "left join a.ruangan b " - + "left join b.modulAplikasi c " - + "left join a.loginUser d " - + "left join d.kelompokUser e " - + "where d.id=:id") - List> getListRuangan( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "b.id as modulAplikasiId," - + "b.modulAplikasi as namaModulAplikasi) " - + "from MapPegawaiToModulAplikasi a " - + "left join a.modulAplikasi b " - + "left join a.pegawai c " + List> getObjectModulHeadByModul(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.id as id," + "a.objekModulAplikasi as objekModulAplikasi," + + "a.alamatUrlForm as alamatUrlForm," + "a.noUrut as noUrut) " + "from ObjekModulAplikasi a " + + "left join a.children b " + "where b.id=:id") + List> getModulByModulHead(@Param("id") Integer id); + + @Query("select NEW Map (" + "b.id as ruanganId," + "b.namaRuangan as namaRuangan," + "c.id as modulAplikasiId," + + "c.modulAplikasi as namaModulAplikasi," + "c.iconImage as iconImage," + "c.noUrut as noUrut," + + "e.id as kelompokUserId," + "e.kelompokUser as kelompokUser) " + "from MapLoginUserToRuangan a " + + "left join a.ruangan b " + "left join b.modulAplikasi c " + "left join a.loginUser d " + + "left join d.kelompokUser e " + "where d.id=:id") + List> getListRuangan(@Param("id") Integer id); + + @Query("select NEW Map (" + "b.id as modulAplikasiId," + "b.modulAplikasi as namaModulAplikasi) " + + "from MapPegawaiToModulAplikasi a " + "left join a.modulAplikasi b " + "left join a.pegawai c " + "where c.id=:id") - List> getListModulAplikasi( - @Param("id") Integer id); - + List> getListModulAplikasi(@Param("id") Integer id); + @Query("select NEW com.jasamedika.medifirst2000.entities.LoginUser(model.id,model.namaUser) " + " from LoginUser model where model.pegawaiId =:idPegawai and model.statusEnabled = true ") - LoginUser findLoginUserByIdPegawai( - @Param("idPegawai") Integer idPegawai); - + LoginUser findLoginUserByIdPegawai(@Param("idPegawai") Integer idPegawai); + @Query("select NEW com.jasamedika.medifirst2000.entities.LoginUser(model.id,model.namaUser) " + " from LoginUser model where model.pegawaiId =:idPegawai and model.statusEnabled = true ") - List findAllLoginUserByIdPegawai( - @Param("idPegawai") Integer idPegawai); - + List findAllLoginUserByIdPegawai(@Param("idPegawai") Integer idPegawai); + @Query("select NEW com.jasamedika.medifirst2000.entities.LoginUser(model.id,model.namaUser) " + " from LoginUser model where model.namaUser =:namaUser and model.statusEnabled = true ") - LoginUser findLoginUserByNamaUser( - @Param("namaUser") String namaUser); - + LoginUser findLoginUserByNamaUser(@Param("namaUser") String namaUser); + @Query("select new Map(model.id as id, model.namaUser as namaUser, model.kelompokUserId as kelompokUserId, model.pegawaiId as pegawaiId) " + "from LoginUser model where model.id = :loginUserId and model.statusEnabled is true") public Map getLoginUserById(@Param("loginUserId") Integer loginUserId); - + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 52b22612..1b2cd019 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -1978,7 +1978,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re result.put("noRec", resultDomain.getId()); result.put("namaUser", username); } - + return result; }