Merge remote-tracking branch 'origin/test' into test

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

@@ -489,8 +489,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 // 外部订单的检测  每个产品只可有一个费用
                 List<PtlAgreementProductCostsNew> list = ptlAgreementProductCostsNewService.list(new LambdaQueryWrapper<PtlAgreementProductCostsNew>()
                         .eq(PtlAgreementProductCostsNew::getProductId, agreementProductCosts.getProductId().get(i))
-                        .eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductCosts.getAgreementId())
-                        .eq(PtlAgreementProductCostsNew::getIsAudit, 1));
+                        .eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductCosts.getAgreementId()));
                 if (list.size() > 0) {
                     throw new SystemException(agreementProductCosts.getProductName().get(i) + "产品费用已存在,请勿重复添加!");
                 }
@@ -1713,8 +1712,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         insFeeOrderNewService.updateById(insFeeOrderNew);
 
         //添加轨迹
-//        InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory(insAreaCompany,"2",BaseController.getUser().getName());
-//        insFeeAuditHistoryService.save(insFeeAuditHistory);
+        InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory(insAreaCompany,"6",BaseController.getUser().getName());
+        insFeeAuditHistoryService.save(insFeeAuditHistory);
 
         return resultFeeOrderNewVo;
 
@@ -1879,6 +1878,8 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         if(inquiryNowFeeQueryVo.getProductId() != null) {
             queryWrapper.eq(PtlAgreementProductCostsNew::getProductId, inquiryNowFeeQueryVo.getProductId());
         }
+        queryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit,"1");
+        queryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow,"0");
         return baseMapper.selectList(queryWrapper);
     }
 }