时间查询修改

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -86,23 +86,26 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
         //审核条件
-        if(agreementProductQueryVo.getIsAudit() != null){
+        if (agreementProductQueryVo.getIsAudit() != null){
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
         }
 
         //产品code
-        if(agreementProductQueryVo.getProductCode() != null){
+        if (agreementProductQueryVo.getProductCode() != null){
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         }
 
         //费用时间
-        if(agreementProductQueryVo.getCostStartDate() != null && agreementProductQueryVo.getCostsEndDate() != null)
+        if (agreementProductQueryVo.getCostStartDate() != null)
         {
             ptlAgreementProductCostsNewLambdaQueryWrapper
-                    .ge(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate())
-                    .le(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
+                    .ge(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate());
         }
 
+        if (agreementProductQueryVo.getCostsEndDate() != null) {
+            ptlAgreementProductCostsNewLambdaQueryWrapper
+                    .le(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
+        }
         //是否有效  1失效  2 有效
         if(agreementProductQueryVo.getIsEffective() != null){
             if(agreementProductQueryVo.getIsEffective().equals("1")) {