|
|
@@ -12,10 +12,12 @@ import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
|
|
|
import com.jzg.commons.entity.dto.CostAgreementParam;
|
|
|
import com.jzg.commons.entity.orders.po.*;
|
|
|
import com.jzg.commons.entity.po.*;
|
|
|
+import com.jzg.commons.entity.quote.vo.KindInfoVo;
|
|
|
import com.jzg.commons.entity.quote.vo.QuoteVo;
|
|
|
import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
|
|
|
import com.jzg.commons.entity.vo.*;
|
|
|
import com.jzg.commons.util.BigDecimalUtil;
|
|
|
+import com.jzg.commons.util.StringUtils;
|
|
|
import com.jzg.quotation.commons.client.OrgClient;
|
|
|
import com.jzg.quotation.summary.aop.FactorMatch;
|
|
|
import com.jzg.quotation.summary.client.PtlNewAgreementClient;
|
|
|
@@ -35,6 +37,7 @@ import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
import java.util.function.BiConsumer;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author quchen
|
|
|
@@ -804,6 +807,11 @@ public class QuoteVerificationAspect {
|
|
|
if (arg instanceof QuoteVo) {
|
|
|
// 1.根据参数判断是否存在调度信息
|
|
|
QuoteVo quoteVo = (QuoteVo)arg;
|
|
|
+ // 过滤险种 前端如果选择不投保的时候 直接过滤掉别让他进报价的逻辑里。
|
|
|
+ if (!quoteVo.getKindInfoVo().isEmpty()) {
|
|
|
+ quoteVo.setKindInfoVo(quoteVo.getKindInfoVo().stream().filter(kindInfoVo ->
|
|
|
+ StringUtils.isNotBlank(kindInfoVo.getAmount()) && !kindInfoVo.getAmount().equals("0")).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
// 判断是否匹配到调度
|
|
|
if(quoteVo.getOrder().getIsDispatch() != null && quoteVo.getOrder().getIsDispatch().equals("1")){
|
|
|
// 获取调度动作
|