diff --git a/src/main/java/com/kospo/svcm/repository/PrcsBizRepository.java b/src/main/java/com/kospo/svcm/repository/PrcsBizRepository.java index 065bfe9..e8d8580 100644 --- a/src/main/java/com/kospo/svcm/repository/PrcsBizRepository.java +++ b/src/main/java/com/kospo/svcm/repository/PrcsBizRepository.java @@ -11,7 +11,9 @@ public interface PrcsBizRepository extends JpaRepository { "inner join PrcsBiz pb on p.prcsNo = pb.id.prcsNo \n" + "inner join ApprMst am on am.prcsNo = p.prcsNo \n" + "and pb.id.bizNo = :bizNo " + - "and p.stCd = '0200' and pb.estStatCd = '0000' and am.apprStatCd = '0200' ") + "and p.stCd = '0200' and pb.estStatCd = '0000' and am.apprStatCd = '0200' " + + "and p.regSdat >= to_char(current_date, 'yyyy-MM-dd') " + + "and p.regEdat <= to_char(current_date, 'yyyy-MM-dd') ") int countReqByBizNo(String bizNo); /*입찰 상태 변경*/ diff --git a/src/main/java/com/kospo/svcm/repository/PrcsRepository.java b/src/main/java/com/kospo/svcm/repository/PrcsRepository.java index 52053eb..a52a184 100644 --- a/src/main/java/com/kospo/svcm/repository/PrcsRepository.java +++ b/src/main/java/com/kospo/svcm/repository/PrcsRepository.java @@ -98,6 +98,8 @@ public interface PrcsRepository extends JpaRepository { "inner join ApprMst am on am.prcsNo = p.prcsNo \n" + "and pb.id.bizNo = :bizNo " + "and p.stCd = '0200' and pb.estStatCd = '0000' and am.apprStatCd = '0200' " + + "and p.regSdat >= to_char(current_date, 'yyyy-MM-dd') " + + "and p.regEdat <= to_char(current_date, 'yyyy-MM-dd') " + "and (:cateCd is null or :cateCd = '' or p.cateCd = :cateCd) " + "and (:regNm is null or :regNm = '' or p.regNm like concat('%', :regNm, '%'))" + "and (:title is null or :title = '' or p.title like concat('%', :title, '%'))" + 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 ea96431..371a776 100644 --- a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java @@ -81,7 +81,7 @@ public class ContServiceImpl implements ContService { if(prcs != null) { if(!prcs.getSvyYn()) throw new CustomException(ErrorCode.No_SVY_NOT_EXECUTE); } else { - if(!contSaveRequest.isExcYn() || StringUtil.isBlank(contSaveRequest.getReason())) throw new CustomMessageException(CustomMessageException.CusMessage.builder() + if(contSaveRequest.isExcYn() && StringUtil.isBlank(contSaveRequest.getReason())) throw new CustomMessageException(CustomMessageException.CusMessage.builder() .code("999999") .message("가격조사를 안했을 시 예외 사유는 필수 입니다.") .build());