Browse Source

添加现询id参数

785834757 2 years ago
parent
commit
3e979df8b8

+ 3 - 0
src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteVo.java

@@ -146,4 +146,7 @@ public class BaseQuoteVo<T> {
     //  add by hxl 2024-07-10
     //  add by hxl 2024-07-10
     @ApiModelProperty("是否暂存")
     @ApiModelProperty("是否暂存")
     private Integer stageFlag;
     private Integer stageFlag;
+
+    @ApiModelProperty("现询费用id")
+    private String nowCostsId;
 }
 }

+ 1 - 0
src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -534,6 +534,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         agreementProductQueryVo.setProductCode(productId);
         agreementProductQueryVo.setProductCode(productId);
         agreementProductQueryVo.setIsAudit("1");
         agreementProductQueryVo.setIsAudit("1");
         agreementProductQueryVo.setAgreementId(ptlAgreement.getId());
         agreementProductQueryVo.setAgreementId(ptlAgreement.getId());
+        agreementProductQueryVo.setNowCostsId(quoteVo.getNowCostsId());
 
 
         List<PtlAgreementProductCostsNew> costsNews = ptlAgreementProductCostsNewService.getByAgreementId(agreementProductQueryVo);
         List<PtlAgreementProductCostsNew> costsNews = ptlAgreementProductCostsNewService.getByAgreementId(agreementProductQueryVo);
 
 

+ 2 - 0
src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -61,6 +61,8 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty("操作结束时间")
     @ApiModelProperty("操作结束时间")
     private String operatorEndTime;
     private String operatorEndTime;
 
 
+    @ApiModelProperty("现询费用id")
+    private String nowCostsId;
 
 
 
 
 }
 }

+ 5 - 0
src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -225,6 +225,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     .lt(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
                     .lt(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
         }
         }
 
 
+        //现询费用id
+        if(agreementProductQueryVo.getNowCostsId() != null){
+            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getId, agreementProductQueryVo.getNowCostsId());
+        }
+
         List<PtlAgreementProductCostsNew> pages = baseMapper.selectList(ptlAgreementProductCostsNewLambdaQueryWrapper);
         List<PtlAgreementProductCostsNew> pages = baseMapper.selectList(ptlAgreementProductCostsNewLambdaQueryWrapper);
 
 
 //                .lt(PtlAgreementProductCostsNew::getCostsStartDate, formattedDateTime)
 //                .lt(PtlAgreementProductCostsNew::getCostsStartDate, formattedDateTime)