diff --git a/src/main/java/com/kospo/svcm/controller/ContController.java b/src/main/java/com/kospo/svcm/controller/ContController.java index 85e4171..e1c5b9b 100644 --- a/src/main/java/com/kospo/svcm/controller/ContController.java +++ b/src/main/java/com/kospo/svcm/controller/ContController.java @@ -71,7 +71,9 @@ public class ContController { }) @GetMapping("/cont/page") public ResponseEntity findCode( - @Parameter(description = "등록상태") @RequestParam(required = false) String contStatCd, + + @Parameter(description = "분야") @RequestParam(required = false) String cateCd, + @Parameter(description = "계약번호") @RequestParam(required = false) String contNo, @Parameter(description = "계약체결시작일") @RequestParam(required = false, defaultValue = "1970-01-01") String signSdt, @Parameter(description = "계약체결종료일") @RequestParam(required = false, defaultValue = "2070-01-01") String signEdt, @Parameter(description = "페이지") @RequestParam("page") int page, @@ -79,7 +81,7 @@ public class ContController { Principal principal ) { Pageable pageable = PageRequest.of(page -1, row); - return ResponseEntity.ok(contService.findPage(principal.getName(), contStatCd, signSdt, signEdt, pageable)); + return ResponseEntity.ok(contService.findPage(principal.getName(), contNo, cateCd, signSdt, signEdt, pageable)); } @Operation(summary = "계약관리 상세조회", description = "계약번호로 조회") diff --git a/src/main/java/com/kospo/svcm/repository/ContRepository.java b/src/main/java/com/kospo/svcm/repository/ContRepository.java index 4281256..a58bdc5 100644 --- a/src/main/java/com/kospo/svcm/repository/ContRepository.java +++ b/src/main/java/com/kospo/svcm/repository/ContRepository.java @@ -45,7 +45,8 @@ public interface ContRepository extends JpaRepository { " c.regSabun as regSabun " + "from Cont c " + "where c.regSabun = :sabun " + - "and (:contStatCd is null or :contStatCd = '' or c.contStatCd = :contStatCd) " + + "and (:contNo is null or :contNo = '' or c.contStatCd like concat('%', :contNo, '%')) " + + "and (:cateCd is null or :cateCd = '' or c.cateCd = :cateCd) " + "and c.signDt between :signSdt and :signEdt order by c.contNo desc") - Page findBySearch(String sabun, String contStatCd, String signSdt, String signEdt, Pageable pageable); + Page findBySearch(String sabun, String contNo, String cateCd, String signSdt, String signEdt, Pageable pageable); } \ No newline at end of file diff --git a/src/main/java/com/kospo/svcm/service/ContService.java b/src/main/java/com/kospo/svcm/service/ContService.java index eb4fbeb..3243450 100644 --- a/src/main/java/com/kospo/svcm/service/ContService.java +++ b/src/main/java/com/kospo/svcm/service/ContService.java @@ -12,7 +12,7 @@ import org.springframework.data.domain.Pageable; import java.util.List; public interface ContService { - PageResponse findPage(String sabun, String contStatCd, String signSdt, String signEdt, Pageable pageable); + PageResponse findPage(String sabun, String contNo, String cateCd, String signSdt, String signEdt, Pageable pageable); @Transactional ContDetailResponse findDetail(String contNo); diff --git a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java index 745200c..c4f362f 100644 --- a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java @@ -48,8 +48,8 @@ public class ContServiceImpl implements ContService { @Transactional @Override - public PageResponse findPage(String sabun, String contStatCd, String signSdt, String signEdt, Pageable pageable) { - Page page = contRepository.findBySearch(sabun, contStatCd, signSdt, signEdt, pageable); + public PageResponse findPage(String sabun, String contNo, String cateCd, String signSdt, String signEdt, Pageable pageable) { + Page page = contRepository.findBySearch(sabun, contNo, cateCd, signSdt, signEdt, pageable); return PageResponse.builder() .pageable(page.getPageable()) .content(page.getContent().stream().map(ContListResponse::iFrom).toList())