fix 补录订单时交强险保单号和商业险保单号不显示问题

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersPolicy.java

@@ -4,9 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-
-import java.io.Serializable;
 
 @Data
 @Schema(description = "保险订单保单信息")

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

@@ -51,71 +51,171 @@ public class QuoteEchoVo extends QuoteVo {
     private static final long serialVersionUID = 1928126868229420046L;
 
     /**
-     * OrderBase追加属性
+     * 订单数据库查询数据转 QuoteVo对象
+     * @param insOrdersVo
      */
-    @Data
-    private static class OrderBaseVo extends OrderBase{
-        @Serial
-        private static final long serialVersionUID = -9184896455541993138L;
+    public QuoteEchoVo(InsOrdersVo insOrdersVo){
+        if(Objects.isNull(this.getOrder())){
+            this.setOrder(new OrderBaseVo());
+        }
+        this.setOrdersNo(insOrdersVo.getId());
+        this.getOrder().setAgreementId(insOrdersVo.getInsOrders().getAgreementId());
+        this.getOrder().setAgreementName(insOrdersVo.getAgreementName());
+        this.getOrder().setAgreementOwnership(insOrdersVo.getAgreementOwnership());
+        this.getOrder().setAgreementType(insOrdersVo.getAgreementType());
+        this.getOrder().setOrdersNo(insOrdersVo.getId());
+        this.getOrder().setQuoteNo(insOrdersVo.getQuoteNo());
+        this.getOrder().setInsuranceCompanyCode(insOrdersVo.getCompanyId());
+        this.getOrder().setCompanyName(insOrdersVo.getCompanyName());
+        this.getOrder().setProductId(insOrdersVo.getProductId());
+        this.getOrder().setProductsName(insOrdersVo.getProductName());
+        this.getOrder().setOrderStatus(insOrdersVo.getInsOrders().getOrderStatus());
+        this.getOrder().setCreateBy(insOrdersVo.getCreateBy());
+        this.getOrder().setCreateTime(insOrdersVo.getCreateTime());
+        this.getOrder().setQuoteTime(insOrdersVo.getCreateTime());
+        this.getOrder().setSigningTime(insOrdersVo.getSigningTime());
+        this.getOrder().setPayTime(insOrdersVo.getPayTime());
+        this.getOrder().setOrderType(insOrdersVo.getOrderType());
+        this.getOrder().setEntryStatus(insOrdersVo.getEntryStatus());
+        this.getOrder().setDockingPerson (insOrdersVo.getDockingPerson());
+        this.getOrder().setDockingPersonPhone(insOrdersVo.getDockingPersonPhone());
+        if (Objects.nonNull(insOrdersVo.getSpecialInfoVo())) {
+            this.setCiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0507")).collect(Collectors.toList()));
+            this.setBiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0510")).collect(Collectors.toList()));
+        }
+        Salesman salesman = new Salesman();
+        if (!Objects.isNull(insOrdersVo.getSalesmanInfo())){
+            salesman.setName(insOrdersVo.getSalesmanInfo().getName());
+            salesman.setDeptName(insOrdersVo.getSalesmanInfo().getDeptName());
+            salesman.setTypeAttr(insOrdersVo.getSalesmanInfo().getTypeAttr());
+            salesman.setDeptId(insOrdersVo.getSalesmanInfo().getDeptId());
+            salesman.setMobile(insOrdersVo.getSalesmanInfo().getMobile());
+            salesman.setSystemCode(insOrdersVo.getSalesmanInfo().getSystemCode());
+            salesman.setSystemName(insOrdersVo.getSalesmanInfo().getSystemName());
+            salesman.setSystemShortName(insOrdersVo.getSalesmanInfo().getSystemShortName());
+            salesman.setRealQuoteUserManagerId(insOrdersVo.getSalesmanInfo().getRealQuoteUserManagerId());
+            salesman.setRealQuoteUserManagerUseName(insOrdersVo.getSalesmanInfo().getRealQuoteUserManagerUseName());
+        }
+        this.setSalesmanInfo(salesman);
+        this.setErrorMessage(insOrdersVo.getErrorMessage());
 
-        private Integer entryStatus;
+        //车辆信息处理
+        this.setCarInfoVo(insOrdersVo.getCarInfoVo());
+        if (Objects.nonNull(insOrdersVo.getCarInfoVo())) {
+            if (Objects.nonNull(insOrdersVo.getCarInfoVo().getRegisterDate()) && insOrdersVo.getCarInfoVo().getRegisterDate().contains(" ")) {
+                insOrdersVo.getCarInfoVo().setRegisterDate(insOrdersVo.getCarInfoVo().getRegisterDate().substring(0, insOrdersVo.getCarInfoVo().getRegisterDate().indexOf(" ")));
+            }
+            if (Objects.nonNull(insOrdersVo.getCarInfoVo().getIssueDate()) && insOrdersVo.getCarInfoVo().getIssueDate().contains(" ")) {
+                insOrdersVo.getCarInfoVo().setIssueDate(insOrdersVo.getCarInfoVo().getIssueDate().substring(0, insOrdersVo.getCarInfoVo().getIssueDate().indexOf(" ")));
+            }
+            if (Objects.nonNull(insOrdersVo.getCarInfoVo().getTransferDate()) && insOrdersVo.getCarInfoVo().getTransferDate().contains(" ")) {
+                insOrdersVo.getCarInfoVo().setTransferDate(insOrdersVo.getCarInfoVo().getTransferDate().substring(0, insOrdersVo.getCarInfoVo().getTransferDate().indexOf(" ")));
+            }
+        }
 
-        private String orderStatus;
-        private String companyName;
-        private String productsName;
+        // 批改信息处理
+        if(Objects.nonNull(insOrdersVo.getInsOrderAdjust())) {
+            InsOrderAdjustVo insOrderAdjustVo = new InsOrderAdjustVo();
+            BeanUtils.copyProperties(insOrdersVo.getInsOrderAdjust(), insOrderAdjustVo);
+            insOrderAdjustVo.setAdjustInfoList(insOrdersVo.getInsOrderAdjust().getAdjustInfoList());
+            this.insOrderAdjustVo = insOrderAdjustVo;
+        }
 
-        private String dockingPerson;
-        private String dockingPersonPhone;
+        //人员处理
+        this.setOwnersInfo(insOrdersVo.getOwnersInfo());
+        this.setPolicyHolderInfo(insOrdersVo.getPolicyHolderInfo());
+        this.setInsuredPersonInfo(insOrdersVo.getInsuredPersonInfo());
 
-        /**
-         * 方案ID
-         */
-        private String schemeId;
+        //险种处理
+        insOrdersVo.getInsOrdersRiskList().forEach(item->{
+            if(item.getRiskCode().equals(RiskCode.TRAFFIC.getCode())){
+                RiskInfoVo riskInfoVo = new RiskInfoVo();
+                riskInfoVo.setRiskCode(RiskCode.TRAFFIC.getCode());
+                // modify by lipf, 提高代码的健壮性 2026年6月2日18:57:09
+                riskInfoVo.setStartDate(item.getStartDate() != null ? item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")): "");
+                riskInfoVo.setEndDate(item.getEndDate() != null ?  item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
+                riskInfoVo.setInstantFlag(item.getStartDate() != null && (item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0));
+                this.setCiRiskInfoVo(riskInfoVo);
+            }
+            if(item.getRiskCode().equals(RiskCode.BUSINESS.getCode())){
+                RiskInfoVo riskInfoVo = new RiskInfoVo();
+                riskInfoVo.setRiskCode(RiskCode.BUSINESS.getCode());
+                riskInfoVo.setStartDate(item.getStartDate() !=null ? item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
+                riskInfoVo.setEndDate(item.getEndDate() != null ? item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
+                riskInfoVo.setInstantFlag(item.getStartDate() != null && (item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0));
+                this.setBiRiskInfoVo(riskInfoVo);
+            }
+        });
+        // 添加交强险种信息
+        if(ProductsType.isContainDj(insOrdersVo.getProductId())){
+            KindInfoVo jqKindInfoVo = new KindInfoVo();
+            jqKindInfoVo.setKindCode("J1");
+            jqKindInfoVo.setKindName("机动车交通事故责任强制保险");
+            if(Objects.nonNull(insOrdersVo.getInsOrdersCosts().getJqPremium())) {
+                jqKindInfoVo.setPremium(insOrdersVo.getInsOrdersCosts().getJqPremium().toString());
+            }
+            jqKindInfoVo.setAmount("200000");
+            jqKindInfoVo.setServiceTimes("200000");
+            jqKindInfoVo.setUnitAmount("200000");
+            insOrdersVo.getKindInfoVo().add(0,jqKindInfoVo);
+        }
+        // 移除交强
+//        insOrdersVo.getKindInfoVo().removeIf(item -> "J1".equals(item.getKindCode()));
 
-        /**
-         * 协议id
-         */
-        private String agreementId;
-        private String agreementName;
-        private String agreementType;
+        this.setKindInfoVo(insOrdersVo.getKindInfoVo());
+        this.setAccidentalDrivings(insOrdersVo.getAccidentalDrivings());
+        this.setVehicleAndVesselTaxVo(insOrdersVo.getVehicleAndVesselTaxVo());
 
-        /**
-         * 协议归属
-         */
-        private String agreementOwnership;
+        //费用处理
+        this.costs = new OrdersCostsVo();
+        if(insOrdersVo.getInsOrdersCosts() != null){
+            this.costs.setCiPremium(insOrdersVo.getInsOrdersCosts().getJqPremium());
+            this.costs.setBiPremium(insOrdersVo.getInsOrdersCosts().getSyPremium());
+            this.costs.setNiPremium(insOrdersVo.getInsOrdersCosts().getJyPremium());
+            this.costs.setVvTax(insOrdersVo.getInsOrdersCosts().getTaxPremium());
+            this.costs.setSumPremium(insOrdersVo.getInsOrdersCosts().getSumPremium());
+            this.costs.setCiRatio(insOrdersVo.getInsOrdersCosts().getJqRatio());
+            this.costs.setBiRatio(insOrdersVo.getInsOrdersCosts().getSyRatio());
+            this.costs.setTotalAmount(insOrdersVo.getInsOrdersCosts().getTotalAmount());
+        }
 
-        private String createBy;
+        //保单号信息
+        this.policy = new OrdersPolicyVo();
+        if(insOrdersVo.getInsOrdersPolicy() != null){
+            this.policy.setCiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJqApplyNo());
+            this.policy.setCiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJqPolicyNo());
+            this.policy.setBiApplyNumber(insOrdersVo.getInsOrdersPolicy().getSyApplyNo());
+            this.policy.setBiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getSyPolicyNo());
+            this.policy.setNiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJyApplyNo());
+            this.policy.setNiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJyPolicyNo());
+        }
+        if(insOrdersVo.getInsOrdersPdfUrl() != null){
+            this.policy.setCiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJqUrl());
+            this.policy.setBiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getSyUrl());
+            this.policy.setNiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJyUrl());
+            this.policy.setCiPolicySignUrl(insOrdersVo.getInsOrdersPdfUrl().getJqSignUrl());
+        }
 
-        /**
-         * 这个方法不能删除， 在前端有用agreementName字段
-         */
-        public String getAgreementTypeName(){
-            if(StrUtil.isEmpty(this.agreementType)){
-                return StrUtil.EMPTY;
-            }
-            // 1、平台协议-平台结算 2、私有协议-自行结算 3、网销协议-自行结算
-            if("1".equals(this.agreementType)){
-                return "平台协议";
-            }else if("2".equals(this.agreementType)){
-                return "私有协议";
-            }else if("3".equals(this.agreementType)) {
-                return  "网销协议";
-            }else{
-                return this.agreementType;
-            }
+        //评分信息
+        this.scoreVo = new QuoteResultsVo.ScoreVo();
+//        this.scoreVo.setScore(insOrdersVo.getInsOrdersOtherInfo().getScore());
+//        this.scoreVo.setJqScore(insOrdersVo.getInsOrdersOtherInfo().getJqScore());
+//        this.scoreVo.setSyScore(insOrdersVo.getInsOrdersOtherInfo().getSyScore());
+//        this.scoreVo.setTpColorScore(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getTpColorScore()) ? null : insOrdersVo.getInsOrdersOtherInfo().getTpColorScore().toString());
+        this.scoreVo.setLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getLossRation().toString());
+        this.scoreVo.setJqLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getJqLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getJqLossRation().toString());
+        this.scoreVo.setSyLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getSyLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getSyLossRation().toString());
+        this.scoreVo.setScoreJson(insOrdersVo.getInsOrdersOtherInfo().getScoreJson());
+
+        // 未匹配费用原因
+        if(Objects.nonNull(insOrdersVo.getInsOrdersOtherInfo())) {
+            this.setFeeNoDescription(insOrdersVo.getInsOrdersOtherInfo().getFeeNoDescription());
         }
 
-        /**
-         * 保司id
-         */
-        private String insuranceCompanyCode;
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-        private LocalDateTime createTime;
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-        private LocalDateTime quoteTime;
-        private String signingTime;
-        private String payTime;
-        private String orderType;
+        //驾意险存储
+        List<AccidentalDrivingVo> accidentalDrivings = insOrdersVo.getAccidentalDrivings();
+
+        this.setAccidentalDrivings(accidentalDrivings);
     }
 
     private OrderBaseVo order;
@@ -353,170 +453,72 @@ public class QuoteEchoVo extends QuoteVo {
     }
 
     /**
-     * 订单数据库查询数据转 QuoteVo对象
-     * @param insOrdersVo
+     * OrderBase追加属性
      */
-    public QuoteEchoVo(InsOrdersVo insOrdersVo){
-        if(Objects.isNull(this.getOrder())){
-            this.setOrder(new OrderBaseVo());
-        }
-        this.setOrdersNo(insOrdersVo.getId());
-        this.getOrder().setAgreementId(insOrdersVo.getInsOrders().getAgreementId());
-        this.getOrder().setAgreementName(insOrdersVo.getAgreementName());
-        this.getOrder().setAgreementOwnership(insOrdersVo.getAgreementOwnership());
-        this.getOrder().setAgreementType(insOrdersVo.getAgreementType());
-        this.getOrder().setOrdersNo(insOrdersVo.getId());
-        this.getOrder().setQuoteNo(insOrdersVo.getQuoteNo());
-        this.getOrder().setInsuranceCompanyCode(insOrdersVo.getCompanyId());
-        this.getOrder().setCompanyName(insOrdersVo.getCompanyName());
-        this.getOrder().setProductId(insOrdersVo.getProductId());
-        this.getOrder().setProductsName(insOrdersVo.getProductName());
-        this.getOrder().setOrderStatus(insOrdersVo.getInsOrders().getOrderStatus());
-        this.getOrder().setCreateBy(insOrdersVo.getCreateBy());
-        this.getOrder().setCreateTime(insOrdersVo.getCreateTime());
-        this.getOrder().setQuoteTime(insOrdersVo.getCreateTime());
-        this.getOrder().setSigningTime(insOrdersVo.getPayTime());
-        this.getOrder().setOrderType(insOrdersVo.getOrderType());
-        this.getOrder().setEntryStatus(insOrdersVo.getEntryStatus());
-        this.getOrder().setDockingPerson (insOrdersVo.getDockingPerson());
-        this.getOrder().setDockingPersonPhone(insOrdersVo.getDockingPersonPhone());
-        if (Objects.nonNull(insOrdersVo.getSpecialInfoVo())) {
-            this.setCiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0507")).collect(Collectors.toList()));
-            this.setBiSpecialInfoVo(insOrdersVo.getSpecialInfoVo().stream().filter(companyClauseVo -> companyClauseVo.getRiskCode().equals("0510")).collect(Collectors.toList()));
-        }
-        Salesman salesman = new Salesman();
-        if (!Objects.isNull(insOrdersVo.getSalesmanInfo())){
-            salesman.setName(insOrdersVo.getSalesmanInfo().getName());
-            salesman.setDeptName(insOrdersVo.getSalesmanInfo().getDeptName());
-            salesman.setTypeAttr(insOrdersVo.getSalesmanInfo().getTypeAttr());
-            salesman.setDeptId(insOrdersVo.getSalesmanInfo().getDeptId());
-            salesman.setMobile(insOrdersVo.getSalesmanInfo().getMobile());
-            salesman.setSystemCode(insOrdersVo.getSalesmanInfo().getSystemCode());
-            salesman.setSystemName(insOrdersVo.getSalesmanInfo().getSystemName());
-            salesman.setSystemShortName(insOrdersVo.getSalesmanInfo().getSystemShortName());
-            salesman.setRealQuoteUserManagerId(insOrdersVo.getSalesmanInfo().getRealQuoteUserManagerId());
-            salesman.setRealQuoteUserManagerUseName(insOrdersVo.getSalesmanInfo().getRealQuoteUserManagerUseName());
-        }
-        this.setSalesmanInfo(salesman);
-        this.setErrorMessage(insOrdersVo.getErrorMessage());
-
-        //车辆信息处理
-        this.setCarInfoVo(insOrdersVo.getCarInfoVo());
-        if (Objects.nonNull(insOrdersVo.getCarInfoVo())) {
-            if (Objects.nonNull(insOrdersVo.getCarInfoVo().getRegisterDate()) && insOrdersVo.getCarInfoVo().getRegisterDate().contains(" ")) {
-                insOrdersVo.getCarInfoVo().setRegisterDate(insOrdersVo.getCarInfoVo().getRegisterDate().substring(0, insOrdersVo.getCarInfoVo().getRegisterDate().indexOf(" ")));
-            }
-            if (Objects.nonNull(insOrdersVo.getCarInfoVo().getIssueDate()) && insOrdersVo.getCarInfoVo().getIssueDate().contains(" ")) {
-                insOrdersVo.getCarInfoVo().setIssueDate(insOrdersVo.getCarInfoVo().getIssueDate().substring(0, insOrdersVo.getCarInfoVo().getIssueDate().indexOf(" ")));
-            }
-            if (Objects.nonNull(insOrdersVo.getCarInfoVo().getTransferDate()) && insOrdersVo.getCarInfoVo().getTransferDate().contains(" ")) {
-                insOrdersVo.getCarInfoVo().setTransferDate(insOrdersVo.getCarInfoVo().getTransferDate().substring(0, insOrdersVo.getCarInfoVo().getTransferDate().indexOf(" ")));
-            }
-        }
+    @Data
+    private static class OrderBaseVo extends OrderBase{
+        @Serial
+        private static final long serialVersionUID = -9184896455541993138L;
 
-        // 批改信息处理
-        if(Objects.nonNull(insOrdersVo.getInsOrderAdjust())) {
-            InsOrderAdjustVo insOrderAdjustVo = new InsOrderAdjustVo();
-            BeanUtils.copyProperties(insOrdersVo.getInsOrderAdjust(), insOrderAdjustVo);
-            insOrderAdjustVo.setAdjustInfoList(insOrdersVo.getInsOrderAdjust().getAdjustInfoList());
-            this.insOrderAdjustVo = insOrderAdjustVo;
-        }
+        private Integer entryStatus;
 
-        //人员处理
-        this.setOwnersInfo(insOrdersVo.getOwnersInfo());
-        this.setPolicyHolderInfo(insOrdersVo.getPolicyHolderInfo());
-        this.setInsuredPersonInfo(insOrdersVo.getInsuredPersonInfo());
+        private String orderStatus;
+        private String companyName;
+        private String productsName;
 
-        //险种处理
-        insOrdersVo.getInsOrdersRiskList().forEach(item->{
-            if(item.getRiskCode().equals(RiskCode.TRAFFIC.getCode())){
-                RiskInfoVo riskInfoVo = new RiskInfoVo();
-                riskInfoVo.setRiskCode(RiskCode.TRAFFIC.getCode());
-                // modify by lipf, 提高代码的健壮性 2026年6月2日18:57:09
-                riskInfoVo.setStartDate(item.getStartDate() != null ? item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")): "");
-                riskInfoVo.setEndDate(item.getEndDate() != null ?  item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
-                riskInfoVo.setInstantFlag(item.getStartDate() != null ? item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0: false);
-                this.setCiRiskInfoVo(riskInfoVo);
-            }
-            if(item.getRiskCode().equals(RiskCode.BUSINESS.getCode())){
-                RiskInfoVo riskInfoVo = new RiskInfoVo();
-                riskInfoVo.setRiskCode(RiskCode.BUSINESS.getCode());
-                riskInfoVo.setStartDate(item.getStartDate() !=null ? item.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
-                riskInfoVo.setEndDate(item.getEndDate() != null ? item.getEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):"");
-                riskInfoVo.setInstantFlag(item.getStartDate() != null && (item.getStartDate().getHour() != 0 || item.getStartDate().getMinute() != 0 || item.getStartDate().getSecond() != 0));
-                this.setBiRiskInfoVo(riskInfoVo);
-            }
-        });
-        // 添加交强险种信息
-        if(ProductsType.isContainDj(insOrdersVo.getProductId())){
-            KindInfoVo jqKindInfoVo = new KindInfoVo();
-            jqKindInfoVo.setKindCode("J1");
-            jqKindInfoVo.setKindName("机动车交通事故责任强制保险");
-            if(Objects.nonNull(insOrdersVo.getInsOrdersCosts().getJqPremium())) {
-                jqKindInfoVo.setPremium(insOrdersVo.getInsOrdersCosts().getJqPremium().toString());
-            }
-            jqKindInfoVo.setAmount("200000");
-            jqKindInfoVo.setServiceTimes("200000");
-            jqKindInfoVo.setUnitAmount("200000");
-            insOrdersVo.getKindInfoVo().add(0,jqKindInfoVo);
-        }
-        // 移除交强
-//        insOrdersVo.getKindInfoVo().removeIf(item -> "J1".equals(item.getKindCode()));
+        private String dockingPerson;
+        private String dockingPersonPhone;
 
-        this.setKindInfoVo(insOrdersVo.getKindInfoVo());
-        this.setAccidentalDrivings(insOrdersVo.getAccidentalDrivings());
-        this.setVehicleAndVesselTaxVo(insOrdersVo.getVehicleAndVesselTaxVo());
+        /**
+         * 方案ID
+         */
+        private String schemeId;
 
-        //费用处理
-        this.costs = new OrdersCostsVo();
-        if(insOrdersVo.getInsOrdersCosts() != null){
-            this.costs.setCiPremium(insOrdersVo.getInsOrdersCosts().getJqPremium());
-            this.costs.setBiPremium(insOrdersVo.getInsOrdersCosts().getSyPremium());
-            this.costs.setNiPremium(insOrdersVo.getInsOrdersCosts().getJyPremium());
-            this.costs.setVvTax(insOrdersVo.getInsOrdersCosts().getTaxPremium());
-            this.costs.setSumPremium(insOrdersVo.getInsOrdersCosts().getSumPremium());
-            this.costs.setCiRatio(insOrdersVo.getInsOrdersCosts().getJqRatio());
-            this.costs.setBiRatio(insOrdersVo.getInsOrdersCosts().getSyRatio());
-            this.costs.setTotalAmount(insOrdersVo.getInsOrdersCosts().getTotalAmount());
-        }
+        /**
+         * 协议id
+         */
+        private String agreementId;
+        private String agreementName;
+        private String agreementType;
 
-        //保单号信息
-        this.policy = new OrdersPolicyVo();
-        if(insOrdersVo.getInsOrdersPolicy() != null){
-            this.policy.setCiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJqApplyNo());
-            this.policy.setCiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJqPolicyNo());
-            this.policy.setBiApplyNumber(insOrdersVo.getInsOrdersPolicy().getSyApplyNo());
-            this.policy.setBiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getSyPolicyNo());
-            this.policy.setNiApplyNumber(insOrdersVo.getInsOrdersPolicy().getJyApplyNo());
-            this.policy.setNiPolicyNumber(insOrdersVo.getInsOrdersPolicy().getJyPolicyNo());
-        }
-        if(insOrdersVo.getInsOrdersPdfUrl() != null){
-            this.policy.setCiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJqUrl());
-            this.policy.setBiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getSyUrl());
-            this.policy.setNiPolicyUrl(insOrdersVo.getInsOrdersPdfUrl().getJyUrl());
-            this.policy.setCiPolicySignUrl(insOrdersVo.getInsOrdersPdfUrl().getJqSignUrl());
-        }
+        /**
+         * 协议归属
+         */
+        private String agreementOwnership;
 
-        //评分信息
-        this.scoreVo = new QuoteResultsVo.ScoreVo();
-//        this.scoreVo.setScore(insOrdersVo.getInsOrdersOtherInfo().getScore());
-//        this.scoreVo.setJqScore(insOrdersVo.getInsOrdersOtherInfo().getJqScore());
-//        this.scoreVo.setSyScore(insOrdersVo.getInsOrdersOtherInfo().getSyScore());
-//        this.scoreVo.setTpColorScore(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getTpColorScore()) ? null : insOrdersVo.getInsOrdersOtherInfo().getTpColorScore().toString());
-        this.scoreVo.setLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getLossRation().toString());
-        this.scoreVo.setJqLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getJqLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getJqLossRation().toString());
-        this.scoreVo.setSyLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getSyLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getSyLossRation().toString());
-        this.scoreVo.setScoreJson(insOrdersVo.getInsOrdersOtherInfo().getScoreJson());
+        private String createBy;
 
-        // 未匹配费用原因
-        if(Objects.nonNull(insOrdersVo.getInsOrdersOtherInfo())) {
-            this.setFeeNoDescription(insOrdersVo.getInsOrdersOtherInfo().getFeeNoDescription());
+        /**
+         * 这个方法不能删除， 在前端有用agreementName字段
+         */
+        public String getAgreementTypeName(){
+            if(StrUtil.isEmpty(this.agreementType)){
+                return StrUtil.EMPTY;
+            }
+            // 1、平台协议-平台结算 2、私有协议-自行结算 3、网销协议-自行结算
+            if("1".equals(this.agreementType)){
+                return "平台协议";
+            }else if("2".equals(this.agreementType)){
+                return "私有协议";
+            }else if("3".equals(this.agreementType)) {
+                return  "网销协议";
+            }else{
+                return this.agreementType;
+            }
         }
 
-        //驾意险存储
-        List<AccidentalDrivingVo> accidentalDrivings = insOrdersVo.getAccidentalDrivings();
-
-        this.setAccidentalDrivings(accidentalDrivings);
+        /**
+         * 保司id
+         */
+        private String insuranceCompanyCode;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private LocalDateTime createTime;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private LocalDateTime quoteTime;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private LocalDateTime signingTime;
+        private String payTime;
+        private String orderType;
     }
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -408,6 +408,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode());
             insOrders.setEntryStatus(3);
             insOrders.setSystemCode(ordersAdd.getSystemCode());
+            insOrders.setPayTime(insOrders.getSigningTime());
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -377,7 +377,10 @@
         from sys_upload_files
         <where>
             and is_delete = 0
-            and id in (${concatenated_string})
+            and id in
+            <foreach collection="concatenated_string.split(',')" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </where>
     </select>