svcm/api
1
0
Fork 0
mirror of https://git.hmsn.ink/kospo/svcm/api.git synced 2026-03-20 00:32:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

대금지급 오류 수정

Browse Source
This commit is contained in:
bangae1
2025-06-04 17:12:20 +09:00
parent 289b8978f7
commit 4c9e1d9bbc
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/kospo/svcm/controller/ContController.java
View File

@@ -71,7 +71,9 @@ public class ContController {
}) })
@GetMapping("/cont/page") @GetMapping("/cont/page")
public ResponseEntity findCode( 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 = "1970-01-01") String signSdt,
@Parameter(description = "계약체결종료일") @RequestParam(required = false, defaultValue = "2070-01-01") String signEdt, @Parameter(description = "계약체결종료일") @RequestParam(required = false, defaultValue = "2070-01-01") String signEdt,
@Parameter(description = "페이지") @RequestParam("page") int page, @Parameter(description = "페이지") @RequestParam("page") int page,
@@ -79,7 +81,7 @@ public class ContController {
Principal principal Principal principal
) { ) {
Pageable pageable = PageRequest.of(page -1, row); 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 = "계약번호로 조회") @Operation(summary = "계약관리 상세조회", description = "계약번호로 조회")

5
src/main/java/com/kospo/svcm/repository/ContRepository.java
View File

@@ -45,7 +45,8 @@ public interface ContRepository extends JpaRepository<Cont, String> {
" c.regSabun as regSabun " + " c.regSabun as regSabun " +
"from Cont c " + "from Cont c " +
"where c.regSabun = :sabun " + "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") "and c.signDt between :signSdt and :signEdt order by c.contNo desc")
Page<IContResponse> findBySearch(String sabun, String contStatCd, String signSdt, String signEdt, Pageable pageable); Page<IContResponse> findBySearch(String sabun, String contNo, String cateCd, String signSdt, String signEdt, Pageable pageable);
} }

2
src/main/java/com/kospo/svcm/service/ContService.java
View File

@@ -12,7 +12,7 @@ import org.springframework.data.domain.Pageable;
import java.util.List; import java.util.List;
public interface ContService { 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 @Transactional
ContDetailResponse findDetail(String contNo); ContDetailResponse findDetail(String contNo);

4
src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java
View File

@@ -48,8 +48,8 @@ public class ContServiceImpl implements ContService {
@Transactional @Transactional
@Override @Override
public PageResponse findPage(String sabun, String contStatCd, String signSdt, String signEdt, Pageable pageable) { public PageResponse findPage(String sabun, String contNo, String cateCd, String signSdt, String signEdt, Pageable pageable) {
Page<ContRepository.IContResponse> page = contRepository.findBySearch(sabun, contStatCd, signSdt, signEdt, pageable); Page<ContRepository.IContResponse> page = contRepository.findBySearch(sabun, contNo, cateCd, signSdt, signEdt, pageable);
return PageResponse.builder() return PageResponse.builder()
.pageable(page.getPageable()) .pageable(page.getPageable())
.content(page.getContent().stream().map(ContListResponse::iFrom).toList()) .content(page.getContent().stream().map(ContListResponse::iFrom).toList())