AndriDiki/smartproc-be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix query

Browse Source
This commit is contained in:
dirgantarasiahaan
2023-05-23 23:21:07 +07:00
parent ded87fcaf6
commit ed88afcdde
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/iconplus/smartproc/repository/JenisAnggaranRepository.java
View File

@@ -19,19 +19,10 @@ public interface JenisAnggaranRepository extends JpaRepository<JenisAnggaran, Lo
"ja.deleted as deleted " +
"FROM JenisAnggaran ja " +
"WHERE ja.deleted = false " +
"ORDER BY ja.id")
Page<JenisAnggaranView> getAllJenisAnggaran(Pageable pageable);
@Query(value = "SELECT ja.id as id, " +
"ja.jenisAnggaran as jenisAnggaran, " +
"ja.keterangan as keterangan, " +
"ja.deleted as deleted " +
"FROM JenisAnggaran ja " +
"WHERE ja.deleted = false " +
"AND (:search is null " +
"AND (:search = '' " +
"or (UPPER(ja.jenisAnggaran) like :search OR UPPER(ja.keterangan) like :search)) " +
"ORDER BY ja.id")
Page<JenisAnggaranView> getAllJenisAnggaranBySearch(String search, Pageable pageable);
Page<JenisAnggaranView> getAllJenisAnggaran(String search, Pageable pageable);
Optional<JenisAnggaran> findByIdAndDeletedFalse(Long id);

9
src/main/java/com/iconplus/smartproc/service/jenisanggaran/GetListJenisAnggaranService.java
View File

@@ -27,14 +27,7 @@ public class GetListJenisAnggaranService implements BaseService<JenisAnggaranReq
public GetListJenisAnggaranResponse execute(JenisAnggaranRequest input) {
validateRequest(input);
List<JenisAnggaranResponse> jenisAnggaranResponseList = new ArrayList<>();
Page<JenisAnggaranView> jenisAnggaranViews;
if (StringUtils.isBlank(input.getSearch())) {
jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaran(input.getPageable());
} else {
jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaranBySearch(input.getSearch(), input.getPageable());
}
Page<JenisAnggaranView> jenisAnggaranViews = jenisAnggaranRepository.getAllJenisAnggaran(input.getSearch(), input.getPageable());
for (JenisAnggaranView jenisAnggaranView : jenisAnggaranViews) {
JenisAnggaranResponse jenisAnggaranResponse = JenisAnggaranResponse.builder()