salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

penyesuaian validasi duplikat nama jabatan

Browse Source
This commit is contained in:
salmanoe 2021-05-04 08:04:44 +07:00
parent a5cdae75d6
commit 20480f0886
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java
View File

@ -57,17 +57,18 @@ public interface JabatanDao extends PagingAndSortingRepository<Jabatan, Integer>
String strDuplikatJabatan = "select new Map(jb.id as id, jb.namaJabatan as namaJabatan) "
+ "from Jabatan jb where jb.statusEnabled is true "
+ "and lower(regexp_replace(jb.namaJabatan,'[^0-9a-zA-Z]+', '', 'g')) = :namaJabatan "
+ "and jb.jenisJabatanId = :jenisJabatanId";
+ "and jb.jenisJabatanId = :jenisJabatanId " + "and jb.unitKerjaId = :unitKerjaId";
String notJabatanId = " and jb.id <> :jabatanId";
@Query(strDuplikatJabatan)
List<Map<String, Object>> checkNamaJabatan(@Param("namaJabatan") String namaJabatan,
@Param("jenisJabatanId") Integer jenisJabatanId);
@Param("jenisJabatanId") Integer jenisJabatanId, @Param("unitKerjaId") Integer unitKerjaId);
@Query(strDuplikatJabatan + notJabatanId)
List<Map<String, Object>> checkNamaJabatan(@Param("jabatanId") Integer idJabatan,
@Param("namaJabatan") String namaJabatan, @Param("jenisJabatanId") Integer idJenisJabatan);
@Param("namaJabatan") String namaJabatan, @Param("jenisJabatanId") Integer idJenisJabatan,
@Param("unitKerjaId") Integer idUnitKerja);
String strJabatan = "select new Map(jb.id as id,jb.namaJabatan as namaJabatan,"
+ "jb.levelJabatan as levelJabatan,jb.subLevelJabatan as levelDireksi,"

3
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JabatanService.java
View File

@ -29,7 +29,8 @@ public interface JabatanService extends BaseVoService<Jabatan, JabatanVO, Intege
JabatanVO deleteJabatan(JabatanVO vo);
Map<String, Object> validateNamaJabatan(Integer idJabatan, String namaJabatan, Integer idJenisJabatan);
Map<String, Object> validateNamaJabatan(Integer idJabatan, String namaJabatan, Integer idJenisJabatan,
Integer idUnitKerja) throws JpaSystemException;
List<Map<String, Object>> findJabatan(String namaJabatan, Integer idJenisJabatan, Integer idUnitKerja);

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JabatanServiceImpl.java
View File

@ -301,16 +301,17 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ
}
@Override
public Map<String, Object> validateNamaJabatan(Integer idJabatan, String namaJabatan, Integer idJenisJabatan) {
public Map<String, Object> validateNamaJabatan(Integer idJabatan, String namaJabatan, Integer idJenisJabatan,
Integer idUnitKerja) throws JpaSystemException {
Map<String, Object> result = new HashMap<>();
String patternText = settingDataFixedDao.getSettingDataFixed("patternTextDuplicate");
String replacedNamaJabatan = namaJabatan.replaceAll(patternText, "").toLowerCase();
List<Map<String, Object>> listNamaJabatan = new ArrayList<>();
if (CommonUtil.isNotNullOrEmpty(idJabatan)) {
listNamaJabatan = jabatanDao.checkNamaJabatan(idJabatan, replacedNamaJabatan, idJenisJabatan);
listNamaJabatan = jabatanDao.checkNamaJabatan(idJabatan, replacedNamaJabatan, idJenisJabatan, idUnitKerja);
} else {
listNamaJabatan = jabatanDao.checkNamaJabatan(replacedNamaJabatan, idJenisJabatan);
listNamaJabatan = jabatanDao.checkNamaJabatan(replacedNamaJabatan, idJenisJabatan, idUnitKerja);
}
if (CommonUtil.isNotNullOrEmpty(listNamaJabatan)) {

6
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java
View File

@ -218,9 +218,11 @@ public class JabatanController extends LocaleController<JabatanVO> {
public ResponseEntity<Map<String, Object>> validateNamaJabatan(HttpServletRequest request,
@RequestParam(value = "idJabatan", required = false) Integer idJabatan,
@RequestParam(value = "namaJabatan", required = true) String namaJabatan,
@RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan) {
@RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan,
@RequestParam(value = "idUnitKerja", required = true) Integer idUnitKerja) {
try {
Map<String, Object> result = jabatanService.validateNamaJabatan(idJabatan, namaJabatan, idJenisJabatan);
Map<String, Object> result = jabatanService.validateNamaJabatan(idJabatan, namaJabatan, idJenisJabatan,
idUnitKerja);
return RestUtil.getJsonResponse(result, HttpStatus.OK);
} catch (ServiceVOException e) {