产品录入 时间查询修改

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

@@ -96,10 +96,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         }
 
         //费用时间
-        if(agreementProductQueryVo.getCostStartDate() != null)
+        if(agreementProductQueryVo.getCostStartDate() != null && agreementProductQueryVo.getCostsEndDate() != null)
         {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.gt(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate())
-                    .or().lt(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
+            ptlAgreementProductCostsNewLambdaQueryWrapper
+                    .ge(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate())
+                    .le(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
         }
 
         //是否有效  1失效  2 有效