bug修改

commons/src/main/java/com/jzg/commons/constants/ProductsType.java

@@ -50,4 +50,17 @@ public enum ProductsType {
         }
         return risks;
     }
+
+    /**
+     * 是否包含单交
+     * @return
+     */
+    public static Boolean isContainDj(String productCode){
+        if(ProductsType.PT_0330.getCode().equals(productCode) ||
+                ProductsType.PT_0330034002.getCode().equals(productCode) ||
+                ProductsType.PT_0330034001.getCode().equals(productCode)){
+            return true;
+        }
+        return false;
+    }
 }

commons/src/main/java/com/jzg/commons/entity/po/PtlAgreementCostExternalType.java

@@ -21,12 +21,8 @@ public class PtlAgreementCostExternalType extends BaseModel {
 
     private BigDecimal export;
 
-    private BigDecimal totalCost;
+    private BigDecimal addThrow;
 
-    private BigDecimal other;
-
-    private BigDecimal level1;
-
-    private BigDecimal level5;
+    private BigDecimal keepPointRatio;
 
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -3,12 +3,14 @@ package com.jzg.commons.entity.quote.vo.aggregated;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.jzg.commons.constants.ProductsType;
 import com.jzg.commons.constants.quote.enums.quote.RiskCode;
 import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersQrcode;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.InsCompanyClause;
 import com.jzg.commons.entity.quote.vo.AccidentalDrivingVo;
+import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.base.OrderBase;
@@ -338,7 +340,18 @@ public class QuoteEchoVo extends QuoteVo {
                 this.setBiRiskInfoVo(riskInfoVo);
             }
         });
+        // 添加交强险种信息
+        if(ProductsType.isContainDj(insOrdersVo.getProductId())){
+            KindInfoVo jqKindInfoVo = new KindInfoVo();
+            jqKindInfoVo.setKindCode("J1");
+            jqKindInfoVo.setKindName("机动车交通事故责任强制保险");
+            jqKindInfoVo.setPremium(insOrdersVo.getInsOrdersCosts().getJqPremium().toString());
+            jqKindInfoVo.setAmount("200000");
+            jqKindInfoVo.setServiceTimes("200000");
+            jqKindInfoVo.setUnitAmount("200000");
+            insOrdersVo.getKindInfoVo().add(0,jqKindInfoVo);
 
+        }
         this.setKindInfoVo(insOrdersVo.getKindInfoVo());
         this.setAccidentalDrivings(insOrdersVo.getAccidentalDrivings());
         this.setVehicleAndVesselTaxVo(insOrdersVo.getVehicleAndVesselTaxVo());

commons/src/main/java/com/jzg/commons/entity/vo/CostExternalTypeVo.java

@@ -16,12 +16,9 @@ public class CostExternalTypeVo {
 
     private BigDecimal export;
 
-    private BigDecimal totalCost;
+    private BigDecimal addThrow;
 
-    private BigDecimal other;
+    private BigDecimal keepPointRatio;
 
-    private BigDecimal level1;
-
-    private BigDecimal level5;
 
 }

commons/src/main/java/com/jzg/commons/entity/vo/RuleAttrMappingVo.java

@@ -48,7 +48,8 @@ public class RuleAttrMappingVo {
         //新车购置价
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("PurchasePriceofNewVehicle", insOrdersCarInfo.getPurchasePrice().toString()));
         //车辆用途
-        ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleUseCode", VehicleUseCode.getByCode(insOrdersCarInfo.getVehicleUseCode())));
+//        ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleUseCode", VehicleUseCode.getByCode(insOrdersCarInfo.getVehicleUseCode())));
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleUseCode", insOrdersCarInfo.getVehicleUseCode()));
         //车辆种类
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("CarNatureCode", insOrdersCarInfo.getCarNatureCode()));
         //车辆类型

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/FactorMatch.java

@@ -39,9 +39,6 @@ public class FactorMatch {
                     .orElse(null);
             //如果查找不到 传值属性 直接费用对比失败
             if (ruleAttrMappingVo == null) {
-//                log.debug("传入的值找不到该属性:" + ptlAgreementProductCostsAttrLink.getAttrCode());
-//                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
-
                 List<PtlAgreementUndwrtRulesAttr> collect = undwrtRulesAttrList.stream()
                         .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
                         .toList();
@@ -64,11 +61,6 @@ public class FactorMatch {
             }
 
             if (!useFlag) {
-//                log.debug("检验的值:" + ptlAgreementProductCostsAttrLink.getMin());
-//                log.debug("传入的值:" + ruleAttrMappingVo.getValue());
-//                log.debug("规则匹配失败:" + ptlAgreementProductCostsAttrLink.getAttrCode());
-
-
                 List<PtlAgreementUndwrtRulesAttr> collect = undwrtRulesAttrList.stream()
                         .filter(x -> x.getAttrCode().equals(ptlAgreementProductCostsAttrLink.getAttrCode()))
                         .toList();
@@ -82,7 +74,8 @@ public class FactorMatch {
                 logs.append("传入的值:" + ruleAttrMappingVo.getValue() + "\n");
 
                 if (!collect.isEmpty()) {
-                    logs.append("<span style=\"color:red;\">规则匹配失败:" + collect.get(0).getAttrName() + "</span>\n");
+//                    logs.append("<span style=\"color:red;\">规则匹配失败:" + collect.get(0).getAttrName() + "</span>\n");
+                    logs.append("规则匹配失败:" + collect.get(0).getAttrName() + "\n");
                 }
 
                 return false;

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -302,6 +303,15 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
     }
 
 
+    public static boolean isValid(String effectiveTime, String failureTime) {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime start = LocalDateTime.parse(effectiveTime,
+                DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        LocalDateTime end = LocalDateTime.parse(failureTime,
+                DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+        return !now.isBefore(start) && !now.isAfter(end);
+    }
 
     @Override
     public HttpResult pageList(PtlAgreementCostParam costParam) {
@@ -313,6 +323,13 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
             if(item.getRuleDescription() != null && !item.getRuleDescription().equals("")){
                 item.setRuleDescription(item.getRuleDescription().substring(0,item.getRuleDescription().length()-1));
             }
+            // 刷新有效状态
+            boolean valid = isValid(item.getEffectiveTime(), item.getFailureTime());
+            if(valid){
+                item.setIsValid("0");
+            }else{
+                item.setIsValid("1");
+            }
         });
         return HttpResult.ok(costManagementVoPage);
     }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesServiceImpl.java

@@ -244,7 +244,7 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
                 desc.append(radioIdentifying(ptlAgreementUndwrtRulesAttr, linkList.get(i))).append("，");
             }
             if ("checkbox".equals(ptlAgreementUndwrtRulesAttr.getAttrType()) || "select".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
-                desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(linkList.get(i).getMin()).append("，");
+                desc.append(checkBoxIdentifying(ptlAgreementUndwrtRulesAttr,linkList.get(i)));
             }
             if ("inputTag".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
                 if (linkList.get(i).getOperator() != null && linkList.get(i).getOperator().equals("1")) {
@@ -262,6 +262,17 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
         return ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + ptlAgreementUndwrtRulesDictLabal.getName();
     }
 
+    private String checkBoxIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementUndwrtRulesAttrLink linkList) {
+        StringBuilder returnMsg = new StringBuilder();
+        returnMsg.append(ptlAgreementUndwrtRulesAttr.getAttrName() + "为");
+        for(int i=0;i<linkList.getMinArray().length;i++) {
+            int finalI = i;
+            PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
+            returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName() + ",");
+        }
+        return returnMsg.toString();
+    }
+
     private String inputNumberIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementUndwrtRulesAttrLink ptlAgreementProductCostsAttrLink) {
         if ("1".equals(ptlAgreementProductCostsAttrLink.getOperator())) {
             return ptlAgreementUndwrtRulesAttr.getAttrName() + "范围值" + ptlAgreementProductCostsAttrLink.getMin() + "到" + ptlAgreementProductCostsAttrLink.getMax();

tenant/organization/src/main/resources/mapper/PtlAgreementCostExternalMapper.xml

@@ -63,7 +63,7 @@
 
     <sql id="Base_Column_type">
         SELECT
-            id,ptl_agreement_cost_external_id,cost_type,inlet,export,total_cost,other,level1,level5
+            id,ptl_agreement_cost_external_id,cost_type,inlet,export,add_throw,keep_point_ratio
         FROM
             ptl_agreement_cost_external_type
     </sql>