|
@@ -438,7 +438,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
|
|
|
ptlAgreementPageVo.getAgreementStartDate())
|
|
ptlAgreementPageVo.getAgreementStartDate())
|
|
|
// 协议止期
|
|
// 协议止期
|
|
|
.ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate,
|
|
.ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate,
|
|
|
- ptlAgreementPageVo.getAgreementEndDate());
|
|
|
|
|
|
|
+ ptlAgreementPageVo.getAgreementEndDate())
|
|
|
|
|
+ // 外部订单
|
|
|
|
|
+ .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getIsExternal()), PtlAgreement::getIsExternal,
|
|
|
|
|
+ ptlAgreementPageVo.getIsExternal());
|
|
|
// 录入时间
|
|
// 录入时间
|
|
|
if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())) {
|
|
if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())) {
|
|
|
LocalDateTime startDateTime = ptlAgreementPageVo.getStartDate().atTime(LocalTime.MIN);
|
|
LocalDateTime startDateTime = ptlAgreementPageVo.getStartDate().atTime(LocalTime.MIN);
|