现询查询

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

@@ -210,24 +210,28 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
         //审核条件
-        if (agreementProductQueryVo.getIsAudit() != null) {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
-        }
+//        if (agreementProductQueryVo.getIsAudit() != null) {
+//
+//        }
 
+        ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
+//        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()) {
+//
+//        }
         //产品code
-        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()) {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
-        }
-
+        ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         //费用时间
-        if (agreementProductQueryVo.getCostStartDate() != null) {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.or().gt(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate())
-                    .lt(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
-        }
+        ptlAgreementProductCostsNewLambdaQueryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
+                .gt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
 
         //现询费用id
         if(agreementProductQueryVo.getNowCostsId() != null){
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getId, agreementProductQueryVo.getNowCostsId());
+            //如果是现询则设置现询id 为1
+            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow, "0");
+        }else{
+            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow, "1");
+
         }
 
         List<PtlAgreementProductCostsNew> pages = baseMapper.selectList(ptlAgreementProductCostsNewLambdaQueryWrapper);
@@ -1885,6 +1889,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         if(inquiryNowFeeQueryVo.getProductId() != null) {
             queryWrapper.eq(PtlAgreementProductCostsNew::getProductId, inquiryNowFeeQueryVo.getProductId());
         }
+        queryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        queryWrapper.gt(PtlAgreementProductCostsNew::getCostsEndDate,LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
         queryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit,"1");
         queryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow,"0");
         List<PtlAgreementProductCostsNew> ptlAgreementProductCostsNews = baseMapper.selectList(queryWrapper);