Browse Source

电销费用修改

wks 2 năm trước cách đây
mục cha
commit
00ef796178

+ 18 - 0
src/main/java/com/ydtech/modules/fee/dao/InsFeeOrderNewHistoryMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.fee.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
+
+/**
+* @author Administrator
+* @description 针对表【ins_fee_order_new_history】的数据库操作Mapper
+* @createDate 2024-08-30 18:08:47
+* @Entity generator.domain.InsFeeOrderNewHistory
+*/
+public interface InsFeeOrderNewHistoryMapper extends BaseMapper<InsFeeOrderNewHistory> {
+
+}
+
+
+
+

+ 1151 - 0
src/main/java/com/ydtech/modules/fee/entity/po/InsFeeOrderNewHistory.java

@@ -0,0 +1,1151 @@
+package com.ydtech.modules.fee.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName ins_fee_order_new_history
+ */
+@TableName(value ="ins_fee_order_new_history")
+@Data
+public class InsFeeOrderNewHistory implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 关联ins_are_company表id
+     */
+    @TableField(value = "ins_order_no")
+    private String insOrderNo;
+
+    /**
+     * 协议id
+     */
+    @TableField(value = "agreement_id")
+    private Long agreementId;
+
+    /**
+     * 使用费用id
+     */
+    @TableField(value = "costs_id")
+    private String costsId;
+
+    /**
+     * 部门id
+     */
+    @TableField(value = "dept_id")
+    private String deptId;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 交强险保费
+     */
+    @TableField(value = "jq_premium")
+    private BigDecimal jqPremium;
+
+    /**
+     * 商业险保费
+     */
+    @TableField(value = "sy_premium")
+    private BigDecimal syPremium;
+
+    /**
+     * 非车险保费
+     */
+    @TableField(value = "no_premium")
+    private BigDecimal noPremium;
+
+    /**
+     * 交强险不含税保费
+     */
+    @TableField(value = "jq_no_tax_premium")
+    private BigDecimal jqNoTaxPremium;
+
+    /**
+     * 商业险不含税保费
+     */
+    @TableField(value = "sy_no_tax_premium")
+    private BigDecimal syNoTaxPremium;
+
+    /**
+     * 非车险不含税保费
+     */
+    @TableField(value = "no_no_tax_premium")
+    private BigDecimal noNoTaxPremium;
+
+    /**
+     * 交强险费用比例
+     */
+    @TableField(value = "jq_costs_proportion")
+    private BigDecimal jqCostsProportion;
+
+    /**
+     * 交强险总费用
+     */
+    @TableField(value = "jq_costs_premiums")
+    private BigDecimal jqCostsPremiums;
+
+    /**
+     * 商业险费用比例
+     */
+    @TableField(value = "sy_costs_proportion")
+    private BigDecimal syCostsProportion;
+
+    /**
+     * 商业险总费用
+     */
+    @TableField(value = "sy_costs_premiums")
+    private BigDecimal syCostsPremiums;
+
+    /**
+     * 非车险费用比例
+     */
+    @TableField(value = "no_costs_proportion")
+    private BigDecimal noCostsProportion;
+
+    /**
+     * 非车险总费用
+     */
+    @TableField(value = "no_costs_premiums")
+    private BigDecimal noCostsPremiums;
+
+    /**
+     * 交强监管费比例
+     */
+    @TableField(value = "jq_supervise_costs_proportion")
+    private BigDecimal jqSuperviseCostsProportion;
+
+    /**
+     * 交强监管费
+     */
+    @TableField(value = "jq_supervise_costs_premiums")
+    private BigDecimal jqSuperviseCostsPremiums;
+
+    /**
+     * 商业监管费比例
+     */
+    @TableField(value = "sy_supervise_costs_proportion")
+    private BigDecimal sySuperviseCostsProportion;
+
+    /**
+     * 商业监管费
+     */
+    @TableField(value = "sy_supervise_costs_premiums")
+    private BigDecimal sySuperviseCostsPremiums;
+
+    /**
+     * 非车监管费比例
+     */
+    @TableField(value = "no_supervise_costs_proportion")
+    private BigDecimal noSuperviseCostsProportion;
+
+    /**
+     * 非车监管费
+     */
+    @TableField(value = "no_supervise_costs_premiums")
+    private BigDecimal noSuperviseCostsPremiums;
+
+    /**
+     * 交强其他费用比例
+     */
+    @TableField(value = "jq_other_costs_proportion")
+    private BigDecimal jqOtherCostsProportion;
+
+    /**
+     * 交强其他费
+     */
+    @TableField(value = "jq_other_costs_premiums")
+    private BigDecimal jqOtherCostsPremiums;
+
+    /**
+     * 商业其他费用比例
+     */
+    @TableField(value = "sy_other_costs_proportion")
+    private BigDecimal syOtherCostsProportion;
+
+    /**
+     * 商业其他费
+     */
+    @TableField(value = "sy_other_costs_premiums")
+    private BigDecimal syOtherCostsPremiums;
+
+    /**
+     * 非车其他费用比例
+     */
+    @TableField(value = "no_other_costs_proportion")
+    private BigDecimal noOtherCostsProportion;
+
+    /**
+     * 非车其他费
+     */
+    @TableField(value = "no_other_costs_premiums")
+    private BigDecimal noOtherCostsPremiums;
+
+    /**
+     * 交强加投费用比例
+     */
+    @TableField(value = "jq_investment_costs_proportion")
+    private BigDecimal jqInvestmentCostsProportion;
+
+    /**
+     * 交强加投费
+     */
+    @TableField(value = "jq_investment_costs_premiums")
+    private BigDecimal jqInvestmentCostsPremiums;
+
+    /**
+     * 商业加投费用比例
+     */
+    @TableField(value = "sy_investment_costs_proportion")
+    private BigDecimal syInvestmentCostsProportion;
+
+    /**
+     * 商业加投费
+     */
+    @TableField(value = "sy_investment_costs_premiums")
+    private BigDecimal syInvestmentCostsPremiums;
+
+    /**
+     * 交强一级机构管理费比例
+     */
+    @TableField(value = "jq_dept_proportion_level_1")
+    private BigDecimal jqDeptProportionLevel1;
+
+    /**
+     * 交强一级机构管理费
+     */
+    @TableField(value = "jq_dept_premiums_level_1")
+    private BigDecimal jqDeptPremiumsLevel1;
+
+    /**
+     * 商业一级机构管理费比例
+     */
+    @TableField(value = "sy_dept_proportion_level_1")
+    private BigDecimal syDeptProportionLevel1;
+
+    /**
+     * 商业一级机构管理费
+     */
+    @TableField(value = "sy_dept_premiums_level_1")
+    private BigDecimal syDeptPremiumsLevel1;
+
+    /**
+     * 非车一级机构管理费比例
+     */
+    @TableField(value = "no_dept_proportion_level_1")
+    private BigDecimal noDeptProportionLevel1;
+
+    /**
+     * 非车一级机构管理费
+     */
+    @TableField(value = "no_dept_premiums_level_1")
+    private BigDecimal noDeptPremiumsLevel1;
+
+    /**
+     * 交强二级机构管理费比例
+     */
+    @TableField(value = "jq_dept_proportion_level_2")
+    private BigDecimal jqDeptProportionLevel2;
+
+    /**
+     * 交强二级机构管理费
+     */
+    @TableField(value = "jq_dept_premiums_level_2")
+    private BigDecimal jqDeptPremiumsLevel2;
+
+    /**
+     * 商业二级机构管理费比例
+     */
+    @TableField(value = "sy_dept_proportion_level_2")
+    private BigDecimal syDeptProportionLevel2;
+
+    /**
+     * 商业二级机构管理费
+     */
+    @TableField(value = "sy_dept_premiums_level_2")
+    private BigDecimal syDeptPremiumsLevel2;
+
+    /**
+     * 非车二级机构管理费比例
+     */
+    @TableField(value = "no_dept_proportion_level_2")
+    private BigDecimal noDeptProportionLevel2;
+
+    /**
+     * 非车二级机构管理费
+     */
+    @TableField(value = "no_dept_premiums_level_2")
+    private BigDecimal noDeptPremiumsLevel2;
+
+    /**
+     * 交强三级机构管理费比例
+     */
+    @TableField(value = "jq_dept_proportion_level_3")
+    private BigDecimal jqDeptProportionLevel3;
+
+    /**
+     * 交强三级机构管理费
+     */
+    @TableField(value = "jq_dept_premiums_level_3")
+    private BigDecimal jqDeptPremiumsLevel3;
+
+    /**
+     * 商业三级机构管理费比例
+     */
+    @TableField(value = "sy_dept_proportion_level_3")
+    private BigDecimal syDeptProportionLevel3;
+
+    /**
+     * 商业三级机构管理费
+     */
+    @TableField(value = "sy_dept_premiums_level_3")
+    private BigDecimal syDeptPremiumsLevel3;
+
+    /**
+     * 非车三级机构管理费比例
+     */
+    @TableField(value = "no_dept_proportion_level_3")
+    private BigDecimal noDeptProportionLevel3;
+
+    /**
+     * 非车三级机构管理费
+     */
+    @TableField(value = "no_dept_premiums_level_3")
+    private BigDecimal noDeptPremiumsLevel3;
+
+    /**
+     * 交强四级机构管理费比例
+     */
+    @TableField(value = "jq_dept_proportion_level_4")
+    private BigDecimal jqDeptProportionLevel4;
+
+    /**
+     * 交强四级机构管理费
+     */
+    @TableField(value = "jq_dept_premiums_level_4")
+    private BigDecimal jqDeptPremiumsLevel4;
+
+    /**
+     * 商业四级机构管理费比例
+     */
+    @TableField(value = "sy_dept_proportion_level_4")
+    private BigDecimal syDeptProportionLevel4;
+
+    /**
+     * 商业四级机构管理费
+     */
+    @TableField(value = "sy_dept_premiums_level_4")
+    private BigDecimal syDeptPremiumsLevel4;
+
+    /**
+     * 非车四级机构管理费比例
+     */
+    @TableField(value = "no_dept_proportion_level_4")
+    private BigDecimal noDeptProportionLevel4;
+
+    /**
+     * 非车四级机构管理费
+     */
+    @TableField(value = "no_dept_premiums_level_4")
+    private BigDecimal noDeptPremiumsLevel4;
+
+    /**
+     * 交强五级机构管理费比例
+     */
+    @TableField(value = "jq_dept_proportion_level_5")
+    private BigDecimal jqDeptProportionLevel5;
+
+    /**
+     * 交强五级机构管理费
+     */
+    @TableField(value = "jq_dept_premiums_level_5")
+    private BigDecimal jqDeptPremiumsLevel5;
+
+    /**
+     * 商业五级机构管理费比例
+     */
+    @TableField(value = "sy_dept_proportion_level_5")
+    private BigDecimal syDeptProportionLevel5;
+
+    /**
+     * 商业五级机构管理费
+     */
+    @TableField(value = "sy_dept_premiums_level_5")
+    private BigDecimal syDeptPremiumsLevel5;
+
+    /**
+     * 非车五级机构管理费比例
+     */
+    @TableField(value = "no_dept_proportion_level_5")
+    private BigDecimal noDeptProportionLevel5;
+
+    /**
+     * 非车五级机构管理费
+     */
+    @TableField(value = "no_dept_premiums_level_5")
+    private BigDecimal noDeptPremiumsLevel5;
+
+    /**
+     * 交强出口手续费比例
+     */
+    @TableField(value = "jq_costs_export_proportion")
+    private BigDecimal jqCostsExportProportion;
+
+    /**
+     * 商业出口手续费比例
+     */
+    @TableField(value = "sy_costs_export_proportion")
+    private BigDecimal syCostsExportProportion;
+
+    /**
+     * 非车出口手续费比例
+     */
+    @TableField(value = "no_costs_export_proportion")
+    private BigDecimal noCostsExportProportion;
+
+    /**
+     * 交强出口加投比例
+     */
+    @TableField(value = "jq_export_investment_proportion")
+    private BigDecimal jqExportInvestmentProportion;
+
+    /**
+     * 交强出口加投费用
+     */
+    @TableField(value = "jq_export_investment_premiums")
+    private BigDecimal jqExportInvestmentPremiums;
+
+    /**
+     * 商业出口加投比例
+     */
+    @TableField(value = "sy_export_investment_proportion")
+    private BigDecimal syExportInvestmentProportion;
+
+    /**
+     * 商业出口加投费用
+     */
+    @TableField(value = "sy_export_investment_premiums")
+    private BigDecimal syExportInvestmentPremiums;
+
+    /**
+     * 一级分销比例
+     */
+    @TableField(value = "first_detail_proportion")
+    private BigDecimal firstDetailProportion;
+
+    /**
+     * 一级分销费
+     */
+    @TableField(value = "first_detail_premiums")
+    private BigDecimal firstDetailPremiums;
+
+    /**
+     * 二级分销比例
+     */
+    @TableField(value = "second_detail_proportion")
+    private BigDecimal secondDetailProportion;
+
+    /**
+     * 二级分销费
+     */
+    @TableField(value = "second_detail_premiums")
+    private BigDecimal secondDetailPremiums;
+
+    /**
+     * 三级分销比例
+     */
+    @TableField(value = "third_detail_proportion")
+    private BigDecimal thirdDetailProportion;
+
+    /**
+     * 三级分销费
+     */
+    @TableField(value = "third_detail_premiums")
+    private BigDecimal thirdDetailPremiums;
+
+    /**
+     * 一级交强分销比例
+     */
+    @TableField(value = "jq_retail_proportion_level_1")
+    private BigDecimal jqRetailProportionLevel1;
+
+    /**
+     * 一级交强分销费
+     */
+    @TableField(value = "jq_retail_premiums_level_1")
+    private BigDecimal jqRetailPremiumsLevel1;
+
+    /**
+     * 一级商业分销比例
+     */
+    @TableField(value = "sy_retail_proportion_level_1")
+    private BigDecimal syRetailProportionLevel1;
+
+    /**
+     * 一级商业分销费
+     */
+    @TableField(value = "sy_retail_premiums_level_1")
+    private BigDecimal syRetailPremiumsLevel1;
+
+    /**
+     * 一级非车分销比例
+     */
+    @TableField(value = "no_retail_proportion_level_1")
+    private BigDecimal noRetailProportionLevel1;
+
+    /**
+     * 一级非车分销费
+     */
+    @TableField(value = "no_retail_premiums_level_1")
+    private BigDecimal noRetailPremiumsLevel1;
+
+    /**
+     * 二级交强分销比例
+     */
+    @TableField(value = "jq_retail_proportion_level_2")
+    private BigDecimal jqRetailProportionLevel2;
+
+    /**
+     * 二级交强分销费
+     */
+    @TableField(value = "jq_retail_premiums_level_2")
+    private BigDecimal jqRetailPremiumsLevel2;
+
+    /**
+     * 二级商业分销比例
+     */
+    @TableField(value = "sy_retail_proportion_level_2")
+    private BigDecimal syRetailProportionLevel2;
+
+    /**
+     * 二级商业分销费
+     */
+    @TableField(value = "sy_retail_premiums_level_2")
+    private BigDecimal syRetailPremiumsLevel2;
+
+    /**
+     * 二级非车分销比例
+     */
+    @TableField(value = "no_retail_proportion_level_2")
+    private BigDecimal noRetailProportionLevel2;
+
+    /**
+     * 二级非车分销费
+     */
+    @TableField(value = "no_retail_premiums_level_2")
+    private BigDecimal noRetailPremiumsLevel2;
+
+    /**
+     * 三级交强分销比例
+     */
+    @TableField(value = "jq_retail_proportion_level_3")
+    private BigDecimal jqRetailProportionLevel3;
+
+    /**
+     * 三级交强分销费
+     */
+    @TableField(value = "jq_retail_premiums_level_3")
+    private BigDecimal jqRetailPremiumsLevel3;
+
+    /**
+     * 三级商业分销比例
+     */
+    @TableField(value = "sy_retail_proportion_level_3")
+    private BigDecimal syRetailProportionLevel3;
+
+    /**
+     * 三级商业分销费
+     */
+    @TableField(value = "sy_retail_premiums_level_3")
+    private BigDecimal syRetailPremiumsLevel3;
+
+    /**
+     * 三级非车分销比例
+     */
+    @TableField(value = "no_retail_proportion_level_3")
+    private BigDecimal noRetailProportionLevel3;
+
+    /**
+     * 三级非车分销费
+     */
+    @TableField(value = "no_retail_premiums_level_3")
+    private BigDecimal noRetailPremiumsLevel3;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 一级分销用户id
+     */
+    @TableField(value = "first_level_user_id")
+    private String firstLevelUserId;
+
+    /**
+     * 二级分销用户id
+     */
+    @TableField(value = "two_level_user_id")
+    private String twoLevelUserId;
+
+    /**
+     * 三级分销用户id
+     */
+    @TableField(value = "three_level_user_id")
+    private String threeLevelUserId;
+
+    /**
+     * 分销等级
+     */
+    @TableField(value = "distribution_status")
+    private String distributionStatus;
+
+    /**
+     * 机构分销费用
+     */
+    @TableField(value = "dept_distribution")
+    private BigDecimal deptDistribution;
+
+    /**
+     * 交强手续费出口金额
+     */
+    @TableField(value = "jq_export_supervise_costs_premiums")
+    private BigDecimal jqExportSuperviseCostsPremiums;
+
+    /**
+     * 商业手续费出口金额
+     */
+    @TableField(value = "sy_export_supervise_costs_premiums")
+    private BigDecimal syExportSuperviseCostsPremiums;
+
+    /**
+     * 非车手续费出口金额
+     */
+    @TableField(value = "no_export_supervise_costs_premiums")
+    private BigDecimal noExportSuperviseCostsPremiums;
+
+    /**
+     * 交强其他费用出口比例
+     */
+    @TableField(value = "jq_export_other_costs_proportion")
+    private BigDecimal jqExportOtherCostsProportion;
+
+    /**
+     * 商业其他费用出口比例
+     */
+    @TableField(value = "sy_export_other_costs_proportion")
+    private BigDecimal syExportOtherCostsProportion;
+
+    /**
+     * 非车其他费用出口比例
+     */
+    @TableField(value = "no_export_other_costs_proportion")
+    private BigDecimal noExportOtherCostsProportion;
+
+    /**
+     * 交强其他费用出口金额
+     */
+    @TableField(value = "jq_export_other_costs_premiums")
+    private BigDecimal jqExportOtherCostsPremiums;
+
+    /**
+     * 商业其他费用出口金额
+     */
+    @TableField(value = "sy_export_other_costs_premiums")
+    private BigDecimal syExportOtherCostsPremiums;
+
+    /**
+     * 非车其他费用出口金额
+     */
+    @TableField(value = "no_export_other_costs_premiums")
+    private BigDecimal noExportOtherCostsPremiums;
+
+    /**
+     * 交强利润差值
+     */
+    @TableField(value = "jq_profit_margin_premiums")
+    private BigDecimal jqProfitMarginPremiums;
+
+    /**
+     * 商业利润差值
+     */
+    @TableField(value = "sy_profit_margin_premiums")
+    private BigDecimal syProfitMarginPremiums;
+
+    /**
+     * 非车利润差值
+     */
+    @TableField(value = "no_profit_margin_premiums")
+    private BigDecimal noProfitMarginPremiums;
+
+    /**
+     * 交强外部比例
+     */
+    @TableField(value = "jq_external_proportion")
+    private BigDecimal jqExternalProportion;
+
+    /**
+     * 商业外部比例
+     */
+    @TableField(value = "sy_external_proportion")
+    private BigDecimal syExternalProportion;
+
+    /**
+     * 飞车外部比例
+     */
+    @TableField(value = "no_external_proportion")
+    private BigDecimal noExternalProportion;
+
+    /**
+     * 交强外部金额
+     */
+    @TableField(value = "jq_external_premiums")
+    private BigDecimal jqExternalPremiums;
+
+    /**
+     * 交强外部金额
+     */
+    @TableField(value = "sy_external_premiums")
+    private BigDecimal syExternalPremiums;
+
+    /**
+     * 交强外部金额
+     */
+    @TableField(value = "no_external_premiums")
+    private BigDecimal noExternalPremiums;
+
+    /**
+     * 操作人id
+     */
+    @TableField(value = "operator_id")
+    private String operatorId;
+
+    /**
+     * 操作时间
+     */
+    @TableField(value = "operator_time")
+    private Date operatorTime;
+
+    /**
+     * 0 不是首次 1 为首次
+     */
+    @TableField(value = "is_first")
+    private Integer isFirst;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        InsFeeOrderNewHistory other = (InsFeeOrderNewHistory) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getInsOrderNo() == null ? other.getInsOrderNo() == null : this.getInsOrderNo().equals(other.getInsOrderNo()))
+            && (this.getAgreementId() == null ? other.getAgreementId() == null : this.getAgreementId().equals(other.getAgreementId()))
+            && (this.getCostsId() == null ? other.getCostsId() == null : this.getCostsId().equals(other.getCostsId()))
+            && (this.getDeptId() == null ? other.getDeptId() == null : this.getDeptId().equals(other.getDeptId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getJqPremium() == null ? other.getJqPremium() == null : this.getJqPremium().equals(other.getJqPremium()))
+            && (this.getSyPremium() == null ? other.getSyPremium() == null : this.getSyPremium().equals(other.getSyPremium()))
+            && (this.getNoPremium() == null ? other.getNoPremium() == null : this.getNoPremium().equals(other.getNoPremium()))
+            && (this.getJqNoTaxPremium() == null ? other.getJqNoTaxPremium() == null : this.getJqNoTaxPremium().equals(other.getJqNoTaxPremium()))
+            && (this.getSyNoTaxPremium() == null ? other.getSyNoTaxPremium() == null : this.getSyNoTaxPremium().equals(other.getSyNoTaxPremium()))
+            && (this.getNoNoTaxPremium() == null ? other.getNoNoTaxPremium() == null : this.getNoNoTaxPremium().equals(other.getNoNoTaxPremium()))
+            && (this.getJqCostsProportion() == null ? other.getJqCostsProportion() == null : this.getJqCostsProportion().equals(other.getJqCostsProportion()))
+            && (this.getJqCostsPremiums() == null ? other.getJqCostsPremiums() == null : this.getJqCostsPremiums().equals(other.getJqCostsPremiums()))
+            && (this.getSyCostsProportion() == null ? other.getSyCostsProportion() == null : this.getSyCostsProportion().equals(other.getSyCostsProportion()))
+            && (this.getSyCostsPremiums() == null ? other.getSyCostsPremiums() == null : this.getSyCostsPremiums().equals(other.getSyCostsPremiums()))
+            && (this.getNoCostsProportion() == null ? other.getNoCostsProportion() == null : this.getNoCostsProportion().equals(other.getNoCostsProportion()))
+            && (this.getNoCostsPremiums() == null ? other.getNoCostsPremiums() == null : this.getNoCostsPremiums().equals(other.getNoCostsPremiums()))
+            && (this.getJqSuperviseCostsProportion() == null ? other.getJqSuperviseCostsProportion() == null : this.getJqSuperviseCostsProportion().equals(other.getJqSuperviseCostsProportion()))
+            && (this.getJqSuperviseCostsPremiums() == null ? other.getJqSuperviseCostsPremiums() == null : this.getJqSuperviseCostsPremiums().equals(other.getJqSuperviseCostsPremiums()))
+            && (this.getSySuperviseCostsProportion() == null ? other.getSySuperviseCostsProportion() == null : this.getSySuperviseCostsProportion().equals(other.getSySuperviseCostsProportion()))
+            && (this.getSySuperviseCostsPremiums() == null ? other.getSySuperviseCostsPremiums() == null : this.getSySuperviseCostsPremiums().equals(other.getSySuperviseCostsPremiums()))
+            && (this.getNoSuperviseCostsProportion() == null ? other.getNoSuperviseCostsProportion() == null : this.getNoSuperviseCostsProportion().equals(other.getNoSuperviseCostsProportion()))
+            && (this.getNoSuperviseCostsPremiums() == null ? other.getNoSuperviseCostsPremiums() == null : this.getNoSuperviseCostsPremiums().equals(other.getNoSuperviseCostsPremiums()))
+            && (this.getJqOtherCostsProportion() == null ? other.getJqOtherCostsProportion() == null : this.getJqOtherCostsProportion().equals(other.getJqOtherCostsProportion()))
+            && (this.getJqOtherCostsPremiums() == null ? other.getJqOtherCostsPremiums() == null : this.getJqOtherCostsPremiums().equals(other.getJqOtherCostsPremiums()))
+            && (this.getSyOtherCostsProportion() == null ? other.getSyOtherCostsProportion() == null : this.getSyOtherCostsProportion().equals(other.getSyOtherCostsProportion()))
+            && (this.getSyOtherCostsPremiums() == null ? other.getSyOtherCostsPremiums() == null : this.getSyOtherCostsPremiums().equals(other.getSyOtherCostsPremiums()))
+            && (this.getNoOtherCostsProportion() == null ? other.getNoOtherCostsProportion() == null : this.getNoOtherCostsProportion().equals(other.getNoOtherCostsProportion()))
+            && (this.getNoOtherCostsPremiums() == null ? other.getNoOtherCostsPremiums() == null : this.getNoOtherCostsPremiums().equals(other.getNoOtherCostsPremiums()))
+            && (this.getJqInvestmentCostsProportion() == null ? other.getJqInvestmentCostsProportion() == null : this.getJqInvestmentCostsProportion().equals(other.getJqInvestmentCostsProportion()))
+            && (this.getJqInvestmentCostsPremiums() == null ? other.getJqInvestmentCostsPremiums() == null : this.getJqInvestmentCostsPremiums().equals(other.getJqInvestmentCostsPremiums()))
+            && (this.getSyInvestmentCostsProportion() == null ? other.getSyInvestmentCostsProportion() == null : this.getSyInvestmentCostsProportion().equals(other.getSyInvestmentCostsProportion()))
+            && (this.getSyInvestmentCostsPremiums() == null ? other.getSyInvestmentCostsPremiums() == null : this.getSyInvestmentCostsPremiums().equals(other.getSyInvestmentCostsPremiums()))
+            && (this.getJqDeptProportionLevel1() == null ? other.getJqDeptProportionLevel1() == null : this.getJqDeptProportionLevel1().equals(other.getJqDeptProportionLevel1()))
+            && (this.getJqDeptPremiumsLevel1() == null ? other.getJqDeptPremiumsLevel1() == null : this.getJqDeptPremiumsLevel1().equals(other.getJqDeptPremiumsLevel1()))
+            && (this.getSyDeptProportionLevel1() == null ? other.getSyDeptProportionLevel1() == null : this.getSyDeptProportionLevel1().equals(other.getSyDeptProportionLevel1()))
+            && (this.getSyDeptPremiumsLevel1() == null ? other.getSyDeptPremiumsLevel1() == null : this.getSyDeptPremiumsLevel1().equals(other.getSyDeptPremiumsLevel1()))
+            && (this.getNoDeptProportionLevel1() == null ? other.getNoDeptProportionLevel1() == null : this.getNoDeptProportionLevel1().equals(other.getNoDeptProportionLevel1()))
+            && (this.getNoDeptPremiumsLevel1() == null ? other.getNoDeptPremiumsLevel1() == null : this.getNoDeptPremiumsLevel1().equals(other.getNoDeptPremiumsLevel1()))
+            && (this.getJqDeptProportionLevel2() == null ? other.getJqDeptProportionLevel2() == null : this.getJqDeptProportionLevel2().equals(other.getJqDeptProportionLevel2()))
+            && (this.getJqDeptPremiumsLevel2() == null ? other.getJqDeptPremiumsLevel2() == null : this.getJqDeptPremiumsLevel2().equals(other.getJqDeptPremiumsLevel2()))
+            && (this.getSyDeptProportionLevel2() == null ? other.getSyDeptProportionLevel2() == null : this.getSyDeptProportionLevel2().equals(other.getSyDeptProportionLevel2()))
+            && (this.getSyDeptPremiumsLevel2() == null ? other.getSyDeptPremiumsLevel2() == null : this.getSyDeptPremiumsLevel2().equals(other.getSyDeptPremiumsLevel2()))
+            && (this.getNoDeptProportionLevel2() == null ? other.getNoDeptProportionLevel2() == null : this.getNoDeptProportionLevel2().equals(other.getNoDeptProportionLevel2()))
+            && (this.getNoDeptPremiumsLevel2() == null ? other.getNoDeptPremiumsLevel2() == null : this.getNoDeptPremiumsLevel2().equals(other.getNoDeptPremiumsLevel2()))
+            && (this.getJqDeptProportionLevel3() == null ? other.getJqDeptProportionLevel3() == null : this.getJqDeptProportionLevel3().equals(other.getJqDeptProportionLevel3()))
+            && (this.getJqDeptPremiumsLevel3() == null ? other.getJqDeptPremiumsLevel3() == null : this.getJqDeptPremiumsLevel3().equals(other.getJqDeptPremiumsLevel3()))
+            && (this.getSyDeptProportionLevel3() == null ? other.getSyDeptProportionLevel3() == null : this.getSyDeptProportionLevel3().equals(other.getSyDeptProportionLevel3()))
+            && (this.getSyDeptPremiumsLevel3() == null ? other.getSyDeptPremiumsLevel3() == null : this.getSyDeptPremiumsLevel3().equals(other.getSyDeptPremiumsLevel3()))
+            && (this.getNoDeptProportionLevel3() == null ? other.getNoDeptProportionLevel3() == null : this.getNoDeptProportionLevel3().equals(other.getNoDeptProportionLevel3()))
+            && (this.getNoDeptPremiumsLevel3() == null ? other.getNoDeptPremiumsLevel3() == null : this.getNoDeptPremiumsLevel3().equals(other.getNoDeptPremiumsLevel3()))
+            && (this.getJqDeptProportionLevel4() == null ? other.getJqDeptProportionLevel4() == null : this.getJqDeptProportionLevel4().equals(other.getJqDeptProportionLevel4()))
+            && (this.getJqDeptPremiumsLevel4() == null ? other.getJqDeptPremiumsLevel4() == null : this.getJqDeptPremiumsLevel4().equals(other.getJqDeptPremiumsLevel4()))
+            && (this.getSyDeptProportionLevel4() == null ? other.getSyDeptProportionLevel4() == null : this.getSyDeptProportionLevel4().equals(other.getSyDeptProportionLevel4()))
+            && (this.getSyDeptPremiumsLevel4() == null ? other.getSyDeptPremiumsLevel4() == null : this.getSyDeptPremiumsLevel4().equals(other.getSyDeptPremiumsLevel4()))
+            && (this.getNoDeptProportionLevel4() == null ? other.getNoDeptProportionLevel4() == null : this.getNoDeptProportionLevel4().equals(other.getNoDeptProportionLevel4()))
+            && (this.getNoDeptPremiumsLevel4() == null ? other.getNoDeptPremiumsLevel4() == null : this.getNoDeptPremiumsLevel4().equals(other.getNoDeptPremiumsLevel4()))
+            && (this.getJqDeptProportionLevel5() == null ? other.getJqDeptProportionLevel5() == null : this.getJqDeptProportionLevel5().equals(other.getJqDeptProportionLevel5()))
+            && (this.getJqDeptPremiumsLevel5() == null ? other.getJqDeptPremiumsLevel5() == null : this.getJqDeptPremiumsLevel5().equals(other.getJqDeptPremiumsLevel5()))
+            && (this.getSyDeptProportionLevel5() == null ? other.getSyDeptProportionLevel5() == null : this.getSyDeptProportionLevel5().equals(other.getSyDeptProportionLevel5()))
+            && (this.getSyDeptPremiumsLevel5() == null ? other.getSyDeptPremiumsLevel5() == null : this.getSyDeptPremiumsLevel5().equals(other.getSyDeptPremiumsLevel5()))
+            && (this.getNoDeptProportionLevel5() == null ? other.getNoDeptProportionLevel5() == null : this.getNoDeptProportionLevel5().equals(other.getNoDeptProportionLevel5()))
+            && (this.getNoDeptPremiumsLevel5() == null ? other.getNoDeptPremiumsLevel5() == null : this.getNoDeptPremiumsLevel5().equals(other.getNoDeptPremiumsLevel5()))
+            && (this.getJqCostsExportProportion() == null ? other.getJqCostsExportProportion() == null : this.getJqCostsExportProportion().equals(other.getJqCostsExportProportion()))
+            && (this.getSyCostsExportProportion() == null ? other.getSyCostsExportProportion() == null : this.getSyCostsExportProportion().equals(other.getSyCostsExportProportion()))
+            && (this.getNoCostsExportProportion() == null ? other.getNoCostsExportProportion() == null : this.getNoCostsExportProportion().equals(other.getNoCostsExportProportion()))
+            && (this.getJqExportInvestmentProportion() == null ? other.getJqExportInvestmentProportion() == null : this.getJqExportInvestmentProportion().equals(other.getJqExportInvestmentProportion()))
+            && (this.getJqExportInvestmentPremiums() == null ? other.getJqExportInvestmentPremiums() == null : this.getJqExportInvestmentPremiums().equals(other.getJqExportInvestmentPremiums()))
+            && (this.getSyExportInvestmentProportion() == null ? other.getSyExportInvestmentProportion() == null : this.getSyExportInvestmentProportion().equals(other.getSyExportInvestmentProportion()))
+            && (this.getSyExportInvestmentPremiums() == null ? other.getSyExportInvestmentPremiums() == null : this.getSyExportInvestmentPremiums().equals(other.getSyExportInvestmentPremiums()))
+            && (this.getFirstDetailProportion() == null ? other.getFirstDetailProportion() == null : this.getFirstDetailProportion().equals(other.getFirstDetailProportion()))
+            && (this.getFirstDetailPremiums() == null ? other.getFirstDetailPremiums() == null : this.getFirstDetailPremiums().equals(other.getFirstDetailPremiums()))
+            && (this.getSecondDetailProportion() == null ? other.getSecondDetailProportion() == null : this.getSecondDetailProportion().equals(other.getSecondDetailProportion()))
+            && (this.getSecondDetailPremiums() == null ? other.getSecondDetailPremiums() == null : this.getSecondDetailPremiums().equals(other.getSecondDetailPremiums()))
+            && (this.getThirdDetailProportion() == null ? other.getThirdDetailProportion() == null : this.getThirdDetailProportion().equals(other.getThirdDetailProportion()))
+            && (this.getThirdDetailPremiums() == null ? other.getThirdDetailPremiums() == null : this.getThirdDetailPremiums().equals(other.getThirdDetailPremiums()))
+            && (this.getJqRetailProportionLevel1() == null ? other.getJqRetailProportionLevel1() == null : this.getJqRetailProportionLevel1().equals(other.getJqRetailProportionLevel1()))
+            && (this.getJqRetailPremiumsLevel1() == null ? other.getJqRetailPremiumsLevel1() == null : this.getJqRetailPremiumsLevel1().equals(other.getJqRetailPremiumsLevel1()))
+            && (this.getSyRetailProportionLevel1() == null ? other.getSyRetailProportionLevel1() == null : this.getSyRetailProportionLevel1().equals(other.getSyRetailProportionLevel1()))
+            && (this.getSyRetailPremiumsLevel1() == null ? other.getSyRetailPremiumsLevel1() == null : this.getSyRetailPremiumsLevel1().equals(other.getSyRetailPremiumsLevel1()))
+            && (this.getNoRetailProportionLevel1() == null ? other.getNoRetailProportionLevel1() == null : this.getNoRetailProportionLevel1().equals(other.getNoRetailProportionLevel1()))
+            && (this.getNoRetailPremiumsLevel1() == null ? other.getNoRetailPremiumsLevel1() == null : this.getNoRetailPremiumsLevel1().equals(other.getNoRetailPremiumsLevel1()))
+            && (this.getJqRetailProportionLevel2() == null ? other.getJqRetailProportionLevel2() == null : this.getJqRetailProportionLevel2().equals(other.getJqRetailProportionLevel2()))
+            && (this.getJqRetailPremiumsLevel2() == null ? other.getJqRetailPremiumsLevel2() == null : this.getJqRetailPremiumsLevel2().equals(other.getJqRetailPremiumsLevel2()))
+            && (this.getSyRetailProportionLevel2() == null ? other.getSyRetailProportionLevel2() == null : this.getSyRetailProportionLevel2().equals(other.getSyRetailProportionLevel2()))
+            && (this.getSyRetailPremiumsLevel2() == null ? other.getSyRetailPremiumsLevel2() == null : this.getSyRetailPremiumsLevel2().equals(other.getSyRetailPremiumsLevel2()))
+            && (this.getNoRetailProportionLevel2() == null ? other.getNoRetailProportionLevel2() == null : this.getNoRetailProportionLevel2().equals(other.getNoRetailProportionLevel2()))
+            && (this.getNoRetailPremiumsLevel2() == null ? other.getNoRetailPremiumsLevel2() == null : this.getNoRetailPremiumsLevel2().equals(other.getNoRetailPremiumsLevel2()))
+            && (this.getJqRetailProportionLevel3() == null ? other.getJqRetailProportionLevel3() == null : this.getJqRetailProportionLevel3().equals(other.getJqRetailProportionLevel3()))
+            && (this.getJqRetailPremiumsLevel3() == null ? other.getJqRetailPremiumsLevel3() == null : this.getJqRetailPremiumsLevel3().equals(other.getJqRetailPremiumsLevel3()))
+            && (this.getSyRetailProportionLevel3() == null ? other.getSyRetailProportionLevel3() == null : this.getSyRetailProportionLevel3().equals(other.getSyRetailProportionLevel3()))
+            && (this.getSyRetailPremiumsLevel3() == null ? other.getSyRetailPremiumsLevel3() == null : this.getSyRetailPremiumsLevel3().equals(other.getSyRetailPremiumsLevel3()))
+            && (this.getNoRetailProportionLevel3() == null ? other.getNoRetailProportionLevel3() == null : this.getNoRetailProportionLevel3().equals(other.getNoRetailProportionLevel3()))
+            && (this.getNoRetailPremiumsLevel3() == null ? other.getNoRetailPremiumsLevel3() == null : this.getNoRetailPremiumsLevel3().equals(other.getNoRetailPremiumsLevel3()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getFirstLevelUserId() == null ? other.getFirstLevelUserId() == null : this.getFirstLevelUserId().equals(other.getFirstLevelUserId()))
+            && (this.getTwoLevelUserId() == null ? other.getTwoLevelUserId() == null : this.getTwoLevelUserId().equals(other.getTwoLevelUserId()))
+            && (this.getThreeLevelUserId() == null ? other.getThreeLevelUserId() == null : this.getThreeLevelUserId().equals(other.getThreeLevelUserId()))
+            && (this.getDistributionStatus() == null ? other.getDistributionStatus() == null : this.getDistributionStatus().equals(other.getDistributionStatus()))
+            && (this.getDeptDistribution() == null ? other.getDeptDistribution() == null : this.getDeptDistribution().equals(other.getDeptDistribution()))
+            && (this.getJqExportSuperviseCostsPremiums() == null ? other.getJqExportSuperviseCostsPremiums() == null : this.getJqExportSuperviseCostsPremiums().equals(other.getJqExportSuperviseCostsPremiums()))
+            && (this.getSyExportSuperviseCostsPremiums() == null ? other.getSyExportSuperviseCostsPremiums() == null : this.getSyExportSuperviseCostsPremiums().equals(other.getSyExportSuperviseCostsPremiums()))
+            && (this.getNoExportSuperviseCostsPremiums() == null ? other.getNoExportSuperviseCostsPremiums() == null : this.getNoExportSuperviseCostsPremiums().equals(other.getNoExportSuperviseCostsPremiums()))
+            && (this.getJqExportOtherCostsProportion() == null ? other.getJqExportOtherCostsProportion() == null : this.getJqExportOtherCostsProportion().equals(other.getJqExportOtherCostsProportion()))
+            && (this.getSyExportOtherCostsProportion() == null ? other.getSyExportOtherCostsProportion() == null : this.getSyExportOtherCostsProportion().equals(other.getSyExportOtherCostsProportion()))
+            && (this.getNoExportOtherCostsProportion() == null ? other.getNoExportOtherCostsProportion() == null : this.getNoExportOtherCostsProportion().equals(other.getNoExportOtherCostsProportion()))
+            && (this.getJqExportOtherCostsPremiums() == null ? other.getJqExportOtherCostsPremiums() == null : this.getJqExportOtherCostsPremiums().equals(other.getJqExportOtherCostsPremiums()))
+            && (this.getSyExportOtherCostsPremiums() == null ? other.getSyExportOtherCostsPremiums() == null : this.getSyExportOtherCostsPremiums().equals(other.getSyExportOtherCostsPremiums()))
+            && (this.getNoExportOtherCostsPremiums() == null ? other.getNoExportOtherCostsPremiums() == null : this.getNoExportOtherCostsPremiums().equals(other.getNoExportOtherCostsPremiums()))
+            && (this.getJqProfitMarginPremiums() == null ? other.getJqProfitMarginPremiums() == null : this.getJqProfitMarginPremiums().equals(other.getJqProfitMarginPremiums()))
+            && (this.getSyProfitMarginPremiums() == null ? other.getSyProfitMarginPremiums() == null : this.getSyProfitMarginPremiums().equals(other.getSyProfitMarginPremiums()))
+            && (this.getNoProfitMarginPremiums() == null ? other.getNoProfitMarginPremiums() == null : this.getNoProfitMarginPremiums().equals(other.getNoProfitMarginPremiums()))
+            && (this.getJqExternalProportion() == null ? other.getJqExternalProportion() == null : this.getJqExternalProportion().equals(other.getJqExternalProportion()))
+            && (this.getSyExternalProportion() == null ? other.getSyExternalProportion() == null : this.getSyExternalProportion().equals(other.getSyExternalProportion()))
+            && (this.getNoExternalProportion() == null ? other.getNoExternalProportion() == null : this.getNoExternalProportion().equals(other.getNoExternalProportion()))
+            && (this.getJqExternalPremiums() == null ? other.getJqExternalPremiums() == null : this.getJqExternalPremiums().equals(other.getJqExternalPremiums()))
+            && (this.getSyExternalPremiums() == null ? other.getSyExternalPremiums() == null : this.getSyExternalPremiums().equals(other.getSyExternalPremiums()))
+            && (this.getNoExternalPremiums() == null ? other.getNoExternalPremiums() == null : this.getNoExternalPremiums().equals(other.getNoExternalPremiums()))
+            && (this.getOperatorId() == null ? other.getOperatorId() == null : this.getOperatorId().equals(other.getOperatorId()))
+            && (this.getOperatorTime() == null ? other.getOperatorTime() == null : this.getOperatorTime().equals(other.getOperatorTime()))
+            && (this.getIsFirst() == null ? other.getIsFirst() == null : this.getIsFirst().equals(other.getIsFirst()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getInsOrderNo() == null) ? 0 : getInsOrderNo().hashCode());
+        result = prime * result + ((getAgreementId() == null) ? 0 : getAgreementId().hashCode());
+        result = prime * result + ((getCostsId() == null) ? 0 : getCostsId().hashCode());
+        result = prime * result + ((getDeptId() == null) ? 0 : getDeptId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getJqPremium() == null) ? 0 : getJqPremium().hashCode());
+        result = prime * result + ((getSyPremium() == null) ? 0 : getSyPremium().hashCode());
+        result = prime * result + ((getNoPremium() == null) ? 0 : getNoPremium().hashCode());
+        result = prime * result + ((getJqNoTaxPremium() == null) ? 0 : getJqNoTaxPremium().hashCode());
+        result = prime * result + ((getSyNoTaxPremium() == null) ? 0 : getSyNoTaxPremium().hashCode());
+        result = prime * result + ((getNoNoTaxPremium() == null) ? 0 : getNoNoTaxPremium().hashCode());
+        result = prime * result + ((getJqCostsProportion() == null) ? 0 : getJqCostsProportion().hashCode());
+        result = prime * result + ((getJqCostsPremiums() == null) ? 0 : getJqCostsPremiums().hashCode());
+        result = prime * result + ((getSyCostsProportion() == null) ? 0 : getSyCostsProportion().hashCode());
+        result = prime * result + ((getSyCostsPremiums() == null) ? 0 : getSyCostsPremiums().hashCode());
+        result = prime * result + ((getNoCostsProportion() == null) ? 0 : getNoCostsProportion().hashCode());
+        result = prime * result + ((getNoCostsPremiums() == null) ? 0 : getNoCostsPremiums().hashCode());
+        result = prime * result + ((getJqSuperviseCostsProportion() == null) ? 0 : getJqSuperviseCostsProportion().hashCode());
+        result = prime * result + ((getJqSuperviseCostsPremiums() == null) ? 0 : getJqSuperviseCostsPremiums().hashCode());
+        result = prime * result + ((getSySuperviseCostsProportion() == null) ? 0 : getSySuperviseCostsProportion().hashCode());
+        result = prime * result + ((getSySuperviseCostsPremiums() == null) ? 0 : getSySuperviseCostsPremiums().hashCode());
+        result = prime * result + ((getNoSuperviseCostsProportion() == null) ? 0 : getNoSuperviseCostsProportion().hashCode());
+        result = prime * result + ((getNoSuperviseCostsPremiums() == null) ? 0 : getNoSuperviseCostsPremiums().hashCode());
+        result = prime * result + ((getJqOtherCostsProportion() == null) ? 0 : getJqOtherCostsProportion().hashCode());
+        result = prime * result + ((getJqOtherCostsPremiums() == null) ? 0 : getJqOtherCostsPremiums().hashCode());
+        result = prime * result + ((getSyOtherCostsProportion() == null) ? 0 : getSyOtherCostsProportion().hashCode());
+        result = prime * result + ((getSyOtherCostsPremiums() == null) ? 0 : getSyOtherCostsPremiums().hashCode());
+        result = prime * result + ((getNoOtherCostsProportion() == null) ? 0 : getNoOtherCostsProportion().hashCode());
+        result = prime * result + ((getNoOtherCostsPremiums() == null) ? 0 : getNoOtherCostsPremiums().hashCode());
+        result = prime * result + ((getJqInvestmentCostsProportion() == null) ? 0 : getJqInvestmentCostsProportion().hashCode());
+        result = prime * result + ((getJqInvestmentCostsPremiums() == null) ? 0 : getJqInvestmentCostsPremiums().hashCode());
+        result = prime * result + ((getSyInvestmentCostsProportion() == null) ? 0 : getSyInvestmentCostsProportion().hashCode());
+        result = prime * result + ((getSyInvestmentCostsPremiums() == null) ? 0 : getSyInvestmentCostsPremiums().hashCode());
+        result = prime * result + ((getJqDeptProportionLevel1() == null) ? 0 : getJqDeptProportionLevel1().hashCode());
+        result = prime * result + ((getJqDeptPremiumsLevel1() == null) ? 0 : getJqDeptPremiumsLevel1().hashCode());
+        result = prime * result + ((getSyDeptProportionLevel1() == null) ? 0 : getSyDeptProportionLevel1().hashCode());
+        result = prime * result + ((getSyDeptPremiumsLevel1() == null) ? 0 : getSyDeptPremiumsLevel1().hashCode());
+        result = prime * result + ((getNoDeptProportionLevel1() == null) ? 0 : getNoDeptProportionLevel1().hashCode());
+        result = prime * result + ((getNoDeptPremiumsLevel1() == null) ? 0 : getNoDeptPremiumsLevel1().hashCode());
+        result = prime * result + ((getJqDeptProportionLevel2() == null) ? 0 : getJqDeptProportionLevel2().hashCode());
+        result = prime * result + ((getJqDeptPremiumsLevel2() == null) ? 0 : getJqDeptPremiumsLevel2().hashCode());
+        result = prime * result + ((getSyDeptProportionLevel2() == null) ? 0 : getSyDeptProportionLevel2().hashCode());
+        result = prime * result + ((getSyDeptPremiumsLevel2() == null) ? 0 : getSyDeptPremiumsLevel2().hashCode());
+        result = prime * result + ((getNoDeptProportionLevel2() == null) ? 0 : getNoDeptProportionLevel2().hashCode());
+        result = prime * result + ((getNoDeptPremiumsLevel2() == null) ? 0 : getNoDeptPremiumsLevel2().hashCode());
+        result = prime * result + ((getJqDeptProportionLevel3() == null) ? 0 : getJqDeptProportionLevel3().hashCode());
+        result = prime * result + ((getJqDeptPremiumsLevel3() == null) ? 0 : getJqDeptPremiumsLevel3().hashCode());
+        result = prime * result + ((getSyDeptProportionLevel3() == null) ? 0 : getSyDeptProportionLevel3().hashCode());
+        result = prime * result + ((getSyDeptPremiumsLevel3() == null) ? 0 : getSyDeptPremiumsLevel3().hashCode());
+        result = prime * result + ((getNoDeptProportionLevel3() == null) ? 0 : getNoDeptProportionLevel3().hashCode());
+        result = prime * result + ((getNoDeptPremiumsLevel3() == null) ? 0 : getNoDeptPremiumsLevel3().hashCode());
+        result = prime * result + ((getJqDeptProportionLevel4() == null) ? 0 : getJqDeptProportionLevel4().hashCode());
+        result = prime * result + ((getJqDeptPremiumsLevel4() == null) ? 0 : getJqDeptPremiumsLevel4().hashCode());
+        result = prime * result + ((getSyDeptProportionLevel4() == null) ? 0 : getSyDeptProportionLevel4().hashCode());
+        result = prime * result + ((getSyDeptPremiumsLevel4() == null) ? 0 : getSyDeptPremiumsLevel4().hashCode());
+        result = prime * result + ((getNoDeptProportionLevel4() == null) ? 0 : getNoDeptProportionLevel4().hashCode());
+        result = prime * result + ((getNoDeptPremiumsLevel4() == null) ? 0 : getNoDeptPremiumsLevel4().hashCode());
+        result = prime * result + ((getJqDeptProportionLevel5() == null) ? 0 : getJqDeptProportionLevel5().hashCode());
+        result = prime * result + ((getJqDeptPremiumsLevel5() == null) ? 0 : getJqDeptPremiumsLevel5().hashCode());
+        result = prime * result + ((getSyDeptProportionLevel5() == null) ? 0 : getSyDeptProportionLevel5().hashCode());
+        result = prime * result + ((getSyDeptPremiumsLevel5() == null) ? 0 : getSyDeptPremiumsLevel5().hashCode());
+        result = prime * result + ((getNoDeptProportionLevel5() == null) ? 0 : getNoDeptProportionLevel5().hashCode());
+        result = prime * result + ((getNoDeptPremiumsLevel5() == null) ? 0 : getNoDeptPremiumsLevel5().hashCode());
+        result = prime * result + ((getJqCostsExportProportion() == null) ? 0 : getJqCostsExportProportion().hashCode());
+        result = prime * result + ((getSyCostsExportProportion() == null) ? 0 : getSyCostsExportProportion().hashCode());
+        result = prime * result + ((getNoCostsExportProportion() == null) ? 0 : getNoCostsExportProportion().hashCode());
+        result = prime * result + ((getJqExportInvestmentProportion() == null) ? 0 : getJqExportInvestmentProportion().hashCode());
+        result = prime * result + ((getJqExportInvestmentPremiums() == null) ? 0 : getJqExportInvestmentPremiums().hashCode());
+        result = prime * result + ((getSyExportInvestmentProportion() == null) ? 0 : getSyExportInvestmentProportion().hashCode());
+        result = prime * result + ((getSyExportInvestmentPremiums() == null) ? 0 : getSyExportInvestmentPremiums().hashCode());
+        result = prime * result + ((getFirstDetailProportion() == null) ? 0 : getFirstDetailProportion().hashCode());
+        result = prime * result + ((getFirstDetailPremiums() == null) ? 0 : getFirstDetailPremiums().hashCode());
+        result = prime * result + ((getSecondDetailProportion() == null) ? 0 : getSecondDetailProportion().hashCode());
+        result = prime * result + ((getSecondDetailPremiums() == null) ? 0 : getSecondDetailPremiums().hashCode());
+        result = prime * result + ((getThirdDetailProportion() == null) ? 0 : getThirdDetailProportion().hashCode());
+        result = prime * result + ((getThirdDetailPremiums() == null) ? 0 : getThirdDetailPremiums().hashCode());
+        result = prime * result + ((getJqRetailProportionLevel1() == null) ? 0 : getJqRetailProportionLevel1().hashCode());
+        result = prime * result + ((getJqRetailPremiumsLevel1() == null) ? 0 : getJqRetailPremiumsLevel1().hashCode());
+        result = prime * result + ((getSyRetailProportionLevel1() == null) ? 0 : getSyRetailProportionLevel1().hashCode());
+        result = prime * result + ((getSyRetailPremiumsLevel1() == null) ? 0 : getSyRetailPremiumsLevel1().hashCode());
+        result = prime * result + ((getNoRetailProportionLevel1() == null) ? 0 : getNoRetailProportionLevel1().hashCode());
+        result = prime * result + ((getNoRetailPremiumsLevel1() == null) ? 0 : getNoRetailPremiumsLevel1().hashCode());
+        result = prime * result + ((getJqRetailProportionLevel2() == null) ? 0 : getJqRetailProportionLevel2().hashCode());
+        result = prime * result + ((getJqRetailPremiumsLevel2() == null) ? 0 : getJqRetailPremiumsLevel2().hashCode());
+        result = prime * result + ((getSyRetailProportionLevel2() == null) ? 0 : getSyRetailProportionLevel2().hashCode());
+        result = prime * result + ((getSyRetailPremiumsLevel2() == null) ? 0 : getSyRetailPremiumsLevel2().hashCode());
+        result = prime * result + ((getNoRetailProportionLevel2() == null) ? 0 : getNoRetailProportionLevel2().hashCode());
+        result = prime * result + ((getNoRetailPremiumsLevel2() == null) ? 0 : getNoRetailPremiumsLevel2().hashCode());
+        result = prime * result + ((getJqRetailProportionLevel3() == null) ? 0 : getJqRetailProportionLevel3().hashCode());
+        result = prime * result + ((getJqRetailPremiumsLevel3() == null) ? 0 : getJqRetailPremiumsLevel3().hashCode());
+        result = prime * result + ((getSyRetailProportionLevel3() == null) ? 0 : getSyRetailProportionLevel3().hashCode());
+        result = prime * result + ((getSyRetailPremiumsLevel3() == null) ? 0 : getSyRetailPremiumsLevel3().hashCode());
+        result = prime * result + ((getNoRetailProportionLevel3() == null) ? 0 : getNoRetailProportionLevel3().hashCode());
+        result = prime * result + ((getNoRetailPremiumsLevel3() == null) ? 0 : getNoRetailPremiumsLevel3().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getFirstLevelUserId() == null) ? 0 : getFirstLevelUserId().hashCode());
+        result = prime * result + ((getTwoLevelUserId() == null) ? 0 : getTwoLevelUserId().hashCode());
+        result = prime * result + ((getThreeLevelUserId() == null) ? 0 : getThreeLevelUserId().hashCode());
+        result = prime * result + ((getDistributionStatus() == null) ? 0 : getDistributionStatus().hashCode());
+        result = prime * result + ((getDeptDistribution() == null) ? 0 : getDeptDistribution().hashCode());
+        result = prime * result + ((getJqExportSuperviseCostsPremiums() == null) ? 0 : getJqExportSuperviseCostsPremiums().hashCode());
+        result = prime * result + ((getSyExportSuperviseCostsPremiums() == null) ? 0 : getSyExportSuperviseCostsPremiums().hashCode());
+        result = prime * result + ((getNoExportSuperviseCostsPremiums() == null) ? 0 : getNoExportSuperviseCostsPremiums().hashCode());
+        result = prime * result + ((getJqExportOtherCostsProportion() == null) ? 0 : getJqExportOtherCostsProportion().hashCode());
+        result = prime * result + ((getSyExportOtherCostsProportion() == null) ? 0 : getSyExportOtherCostsProportion().hashCode());
+        result = prime * result + ((getNoExportOtherCostsProportion() == null) ? 0 : getNoExportOtherCostsProportion().hashCode());
+        result = prime * result + ((getJqExportOtherCostsPremiums() == null) ? 0 : getJqExportOtherCostsPremiums().hashCode());
+        result = prime * result + ((getSyExportOtherCostsPremiums() == null) ? 0 : getSyExportOtherCostsPremiums().hashCode());
+        result = prime * result + ((getNoExportOtherCostsPremiums() == null) ? 0 : getNoExportOtherCostsPremiums().hashCode());
+        result = prime * result + ((getJqProfitMarginPremiums() == null) ? 0 : getJqProfitMarginPremiums().hashCode());
+        result = prime * result + ((getSyProfitMarginPremiums() == null) ? 0 : getSyProfitMarginPremiums().hashCode());
+        result = prime * result + ((getNoProfitMarginPremiums() == null) ? 0 : getNoProfitMarginPremiums().hashCode());
+        result = prime * result + ((getJqExternalProportion() == null) ? 0 : getJqExternalProportion().hashCode());
+        result = prime * result + ((getSyExternalProportion() == null) ? 0 : getSyExternalProportion().hashCode());
+        result = prime * result + ((getNoExternalProportion() == null) ? 0 : getNoExternalProportion().hashCode());
+        result = prime * result + ((getJqExternalPremiums() == null) ? 0 : getJqExternalPremiums().hashCode());
+        result = prime * result + ((getSyExternalPremiums() == null) ? 0 : getSyExternalPremiums().hashCode());
+        result = prime * result + ((getNoExternalPremiums() == null) ? 0 : getNoExternalPremiums().hashCode());
+        result = prime * result + ((getOperatorId() == null) ? 0 : getOperatorId().hashCode());
+        result = prime * result + ((getOperatorTime() == null) ? 0 : getOperatorTime().hashCode());
+        result = prime * result + ((getIsFirst() == null) ? 0 : getIsFirst().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", insOrderNo=").append(insOrderNo);
+        sb.append(", agreementId=").append(agreementId);
+        sb.append(", costsId=").append(costsId);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", userId=").append(userId);
+        sb.append(", jqPremium=").append(jqPremium);
+        sb.append(", syPremium=").append(syPremium);
+        sb.append(", noPremium=").append(noPremium);
+        sb.append(", jqNoTaxPremium=").append(jqNoTaxPremium);
+        sb.append(", syNoTaxPremium=").append(syNoTaxPremium);
+        sb.append(", noNoTaxPremium=").append(noNoTaxPremium);
+        sb.append(", jqCostsProportion=").append(jqCostsProportion);
+        sb.append(", jqCostsPremiums=").append(jqCostsPremiums);
+        sb.append(", syCostsProportion=").append(syCostsProportion);
+        sb.append(", syCostsPremiums=").append(syCostsPremiums);
+        sb.append(", noCostsProportion=").append(noCostsProportion);
+        sb.append(", noCostsPremiums=").append(noCostsPremiums);
+        sb.append(", jqSuperviseCostsProportion=").append(jqSuperviseCostsProportion);
+        sb.append(", jqSuperviseCostsPremiums=").append(jqSuperviseCostsPremiums);
+        sb.append(", sySuperviseCostsProportion=").append(sySuperviseCostsProportion);
+        sb.append(", sySuperviseCostsPremiums=").append(sySuperviseCostsPremiums);
+        sb.append(", noSuperviseCostsProportion=").append(noSuperviseCostsProportion);
+        sb.append(", noSuperviseCostsPremiums=").append(noSuperviseCostsPremiums);
+        sb.append(", jqOtherCostsProportion=").append(jqOtherCostsProportion);
+        sb.append(", jqOtherCostsPremiums=").append(jqOtherCostsPremiums);
+        sb.append(", syOtherCostsProportion=").append(syOtherCostsProportion);
+        sb.append(", syOtherCostsPremiums=").append(syOtherCostsPremiums);
+        sb.append(", noOtherCostsProportion=").append(noOtherCostsProportion);
+        sb.append(", noOtherCostsPremiums=").append(noOtherCostsPremiums);
+        sb.append(", jqInvestmentCostsProportion=").append(jqInvestmentCostsProportion);
+        sb.append(", jqInvestmentCostsPremiums=").append(jqInvestmentCostsPremiums);
+        sb.append(", syInvestmentCostsProportion=").append(syInvestmentCostsProportion);
+        sb.append(", syInvestmentCostsPremiums=").append(syInvestmentCostsPremiums);
+        sb.append(", jqDeptProportionLevel1=").append(jqDeptProportionLevel1);
+        sb.append(", jqDeptPremiumsLevel1=").append(jqDeptPremiumsLevel1);
+        sb.append(", syDeptProportionLevel1=").append(syDeptProportionLevel1);
+        sb.append(", syDeptPremiumsLevel1=").append(syDeptPremiumsLevel1);
+        sb.append(", noDeptProportionLevel1=").append(noDeptProportionLevel1);
+        sb.append(", noDeptPremiumsLevel1=").append(noDeptPremiumsLevel1);
+        sb.append(", jqDeptProportionLevel2=").append(jqDeptProportionLevel2);
+        sb.append(", jqDeptPremiumsLevel2=").append(jqDeptPremiumsLevel2);
+        sb.append(", syDeptProportionLevel2=").append(syDeptProportionLevel2);
+        sb.append(", syDeptPremiumsLevel2=").append(syDeptPremiumsLevel2);
+        sb.append(", noDeptProportionLevel2=").append(noDeptProportionLevel2);
+        sb.append(", noDeptPremiumsLevel2=").append(noDeptPremiumsLevel2);
+        sb.append(", jqDeptProportionLevel3=").append(jqDeptProportionLevel3);
+        sb.append(", jqDeptPremiumsLevel3=").append(jqDeptPremiumsLevel3);
+        sb.append(", syDeptProportionLevel3=").append(syDeptProportionLevel3);
+        sb.append(", syDeptPremiumsLevel3=").append(syDeptPremiumsLevel3);
+        sb.append(", noDeptProportionLevel3=").append(noDeptProportionLevel3);
+        sb.append(", noDeptPremiumsLevel3=").append(noDeptPremiumsLevel3);
+        sb.append(", jqDeptProportionLevel4=").append(jqDeptProportionLevel4);
+        sb.append(", jqDeptPremiumsLevel4=").append(jqDeptPremiumsLevel4);
+        sb.append(", syDeptProportionLevel4=").append(syDeptProportionLevel4);
+        sb.append(", syDeptPremiumsLevel4=").append(syDeptPremiumsLevel4);
+        sb.append(", noDeptProportionLevel4=").append(noDeptProportionLevel4);
+        sb.append(", noDeptPremiumsLevel4=").append(noDeptPremiumsLevel4);
+        sb.append(", jqDeptProportionLevel5=").append(jqDeptProportionLevel5);
+        sb.append(", jqDeptPremiumsLevel5=").append(jqDeptPremiumsLevel5);
+        sb.append(", syDeptProportionLevel5=").append(syDeptProportionLevel5);
+        sb.append(", syDeptPremiumsLevel5=").append(syDeptPremiumsLevel5);
+        sb.append(", noDeptProportionLevel5=").append(noDeptProportionLevel5);
+        sb.append(", noDeptPremiumsLevel5=").append(noDeptPremiumsLevel5);
+        sb.append(", jqCostsExportProportion=").append(jqCostsExportProportion);
+        sb.append(", syCostsExportProportion=").append(syCostsExportProportion);
+        sb.append(", noCostsExportProportion=").append(noCostsExportProportion);
+        sb.append(", jqExportInvestmentProportion=").append(jqExportInvestmentProportion);
+        sb.append(", jqExportInvestmentPremiums=").append(jqExportInvestmentPremiums);
+        sb.append(", syExportInvestmentProportion=").append(syExportInvestmentProportion);
+        sb.append(", syExportInvestmentPremiums=").append(syExportInvestmentPremiums);
+        sb.append(", firstDetailProportion=").append(firstDetailProportion);
+        sb.append(", firstDetailPremiums=").append(firstDetailPremiums);
+        sb.append(", secondDetailProportion=").append(secondDetailProportion);
+        sb.append(", secondDetailPremiums=").append(secondDetailPremiums);
+        sb.append(", thirdDetailProportion=").append(thirdDetailProportion);
+        sb.append(", thirdDetailPremiums=").append(thirdDetailPremiums);
+        sb.append(", jqRetailProportionLevel1=").append(jqRetailProportionLevel1);
+        sb.append(", jqRetailPremiumsLevel1=").append(jqRetailPremiumsLevel1);
+        sb.append(", syRetailProportionLevel1=").append(syRetailProportionLevel1);
+        sb.append(", syRetailPremiumsLevel1=").append(syRetailPremiumsLevel1);
+        sb.append(", noRetailProportionLevel1=").append(noRetailProportionLevel1);
+        sb.append(", noRetailPremiumsLevel1=").append(noRetailPremiumsLevel1);
+        sb.append(", jqRetailProportionLevel2=").append(jqRetailProportionLevel2);
+        sb.append(", jqRetailPremiumsLevel2=").append(jqRetailPremiumsLevel2);
+        sb.append(", syRetailProportionLevel2=").append(syRetailProportionLevel2);
+        sb.append(", syRetailPremiumsLevel2=").append(syRetailPremiumsLevel2);
+        sb.append(", noRetailProportionLevel2=").append(noRetailProportionLevel2);
+        sb.append(", noRetailPremiumsLevel2=").append(noRetailPremiumsLevel2);
+        sb.append(", jqRetailProportionLevel3=").append(jqRetailProportionLevel3);
+        sb.append(", jqRetailPremiumsLevel3=").append(jqRetailPremiumsLevel3);
+        sb.append(", syRetailProportionLevel3=").append(syRetailProportionLevel3);
+        sb.append(", syRetailPremiumsLevel3=").append(syRetailPremiumsLevel3);
+        sb.append(", noRetailProportionLevel3=").append(noRetailProportionLevel3);
+        sb.append(", noRetailPremiumsLevel3=").append(noRetailPremiumsLevel3);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", firstLevelUserId=").append(firstLevelUserId);
+        sb.append(", twoLevelUserId=").append(twoLevelUserId);
+        sb.append(", threeLevelUserId=").append(threeLevelUserId);
+        sb.append(", distributionStatus=").append(distributionStatus);
+        sb.append(", deptDistribution=").append(deptDistribution);
+        sb.append(", jqExportSuperviseCostsPremiums=").append(jqExportSuperviseCostsPremiums);
+        sb.append(", syExportSuperviseCostsPremiums=").append(syExportSuperviseCostsPremiums);
+        sb.append(", noExportSuperviseCostsPremiums=").append(noExportSuperviseCostsPremiums);
+        sb.append(", jqExportOtherCostsProportion=").append(jqExportOtherCostsProportion);
+        sb.append(", syExportOtherCostsProportion=").append(syExportOtherCostsProportion);
+        sb.append(", noExportOtherCostsProportion=").append(noExportOtherCostsProportion);
+        sb.append(", jqExportOtherCostsPremiums=").append(jqExportOtherCostsPremiums);
+        sb.append(", syExportOtherCostsPremiums=").append(syExportOtherCostsPremiums);
+        sb.append(", noExportOtherCostsPremiums=").append(noExportOtherCostsPremiums);
+        sb.append(", jqProfitMarginPremiums=").append(jqProfitMarginPremiums);
+        sb.append(", syProfitMarginPremiums=").append(syProfitMarginPremiums);
+        sb.append(", noProfitMarginPremiums=").append(noProfitMarginPremiums);
+        sb.append(", jqExternalProportion=").append(jqExternalProportion);
+        sb.append(", syExternalProportion=").append(syExternalProportion);
+        sb.append(", noExternalProportion=").append(noExternalProportion);
+        sb.append(", jqExternalPremiums=").append(jqExternalPremiums);
+        sb.append(", syExternalPremiums=").append(syExternalPremiums);
+        sb.append(", noExternalPremiums=").append(noExternalPremiums);
+        sb.append(", operatorId=").append(operatorId);
+        sb.append(", operatorTime=").append(operatorTime);
+        sb.append(", isFirst=").append(isFirst);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 38 - 0
src/main/java/com/ydtech/modules/fee/service/InsFeeOrderNewHistoryService.java

@@ -0,0 +1,38 @@
+package com.ydtech.modules.fee.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+
+/**
+* @author Administrator
+* @description 针对表【ins_fee_order_new_history】的数据库操作Service
+* @createDate 2024-08-30 18:08:47
+*/
+public interface InsFeeOrderNewHistoryService extends IService<InsFeeOrderNewHistory> {
+
+    /**
+     * 首次添加历史记录
+     * @param insFeeOrderNew
+     */
+    void saveInsFeeOrderNewHistory(InsFeeOrderNew insFeeOrderNew);
+
+    /**
+     * 转换
+     * @param insFeeOrderNew
+     * @return
+     */
+    InsFeeOrderNewHistory toInsFeeOrderNewHistory(InsFeeOrderNew insFeeOrderNew);
+
+    /**
+     * 获取最新订单信息
+     * @param id 子订单
+     * @return
+     */
+    default InsFeeOrderNewHistory getByInsOrderNo(String id){
+        return lambdaQuery()
+                .eq(InsFeeOrderNewHistory::getInsOrderNo, id)
+                .eq(InsFeeOrderNewHistory::getIsFirst, "1")
+                .one();
+    }
+}

+ 5 - 0
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -19,6 +19,7 @@ import com.ydtech.modules.fee.dto.vo.RuleAttrMappingVo;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.fee.service.InsFeeOrderConfigService;
+import com.ydtech.modules.fee.service.InsFeeOrderNewHistoryService;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
@@ -101,6 +102,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     @Autowired
     private SysSwitchConfigService sysSwitchConfigService;
 
+    @Autowired
+    private InsFeeOrderNewHistoryService insFeeOrderNewHistoryService;
+
     @Override
     public QueryOrderFeeVo queryFeeOrderInfo(String companyId) {
         return null;
@@ -1979,6 +1983,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             throw new SystemException("非车比例异常");
 
         //endregion
+        insFeeOrderNewHistoryService.saveInsFeeOrderNewHistory(insFeeOrderNew);
         insFeeOrderNewService.saveOrUpdate(insFeeOrderNew);
     }
 

+ 52 - 0
src/main/java/com/ydtech/modules/fee/service/impl/InsFeeOrderNewHistoryServiceImpl.java

@@ -0,0 +1,52 @@
+package com.ydtech.modules.fee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.fee.dao.InsFeeOrderNewHistoryMapper;
+import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
+import com.ydtech.modules.fee.service.InsFeeOrderNewHistoryService;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+* @author Administrator
+* @description 针对表【ins_fee_order_new_history】的数据库操作Service实现
+* @createDate 2024-08-30 18:08:47
+*/
+@Service
+public class InsFeeOrderNewHistoryServiceImpl extends ServiceImpl<InsFeeOrderNewHistoryMapper, InsFeeOrderNewHistory>
+    implements InsFeeOrderNewHistoryService {
+
+    @Override
+    public void saveInsFeeOrderNewHistory(InsFeeOrderNew insFeeOrderNew) {
+        final Integer isFirst = 1;
+        InsFeeOrderNewHistory one = lambdaQuery()
+                .eq(InsFeeOrderNewHistory::getInsOrderNo, insFeeOrderNew.getInsOrderNo())
+                .eq(InsFeeOrderNewHistory::getIsFirst, isFirst)
+                .one();
+
+        InsFeeOrderNewHistory insFeeOrderNewHistory = toInsFeeOrderNewHistory(insFeeOrderNew);
+        if (ObjectUtils.isEmpty(one)) {
+            insFeeOrderNewHistory.setIsFirst(isFirst);
+        }
+        save(insFeeOrderNewHistory);
+    }
+
+    @Override
+    public InsFeeOrderNewHistory toInsFeeOrderNewHistory(InsFeeOrderNew insFeeOrderNew) {
+        InsFeeOrderNewHistory insFeeOrderNewHistory = new InsFeeOrderNewHistory();
+        BeanUtils.copyProperties(insFeeOrderNew, insFeeOrderNewHistory);
+        insFeeOrderNewHistory.setOperatorId(BaseController.getUserId());
+        insFeeOrderNewHistory.setOperatorTime(new Date());
+        return insFeeOrderNewHistory;
+    }
+
+}
+
+
+
+

+ 4 - 4
src/main/java/com/ydtech/modules/order/controller/InsTelemarketingOrderController.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderEditVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingQueryExpensesVo;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,12 +43,11 @@ public class InsTelemarketingOrderController {
         return HttpResult.ok();
     }
 
-    @GetMapping("/queryExpenses/{subOrderNo}")
+    @PostMapping("/queryExpenses")
     @ApiOperation(value = "编辑查询")
-    public HttpResult<TelemarketingAuditOrderEditVo> queryExpenses(@PathVariable String subOrderNo){
-        TelemarketingAuditOrderEditVo telemarketingAuditOrderEditVo = insTelemarketingOrderService.queryExpenses(subOrderNo);
+    public HttpResult<TelemarketingAuditOrderEditVo> queryExpenses(@RequestBody TelemarketingQueryExpensesVo telemarketingQueryExpensesVo){
+        TelemarketingAuditOrderEditVo telemarketingAuditOrderEditVo = insTelemarketingOrderService.queryExpenses(telemarketingQueryExpensesVo);
         return HttpResult.ok(telemarketingAuditOrderEditVo);
     }
 
-
 }

+ 1 - 0
src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingAuditOrderEditVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.vo.telemarketing;
 
 
+import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
 import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import io.swagger.annotations.ApiModelProperty;

+ 2 - 0
src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingAuditOrderQueryVo.java

@@ -43,4 +43,6 @@ public class TelemarketingAuditOrderQueryVo extends BasePageVO implements Serial
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate endDate;
 
+    @ApiModelProperty(value = "审核状态")
+    private String auditStatus;
 }

+ 24 - 0
src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingQueryExpensesVo.java

@@ -0,0 +1,24 @@
+package com.ydtech.modules.order.entity.vo.telemarketing;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TelemarketingQueryExpensesVo implements Serializable {
+
+    private static final long serialVersionUID = 387376536336427502L;
+
+    @ApiModelProperty("子订单")
+    private String subOrderId;
+
+    @ApiModelProperty("状态 1 初始  2 修改后 ")
+    private String state;
+
+}

+ 3 - 2
src/main/java/com/ydtech/modules/order/service/InsTelemarketingOrderService.java

@@ -5,6 +5,7 @@ import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderEditVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingQueryExpensesVo;
 
 public interface InsTelemarketingOrderService {
 
@@ -32,8 +33,8 @@ public interface InsTelemarketingOrderService {
 
     /**
      * 修改编辑
-     * @param subOrderNo 子订单编号
+     * @param telemarketingQueryExpensesVo 子订单编号
      */
-    TelemarketingAuditOrderEditVo queryExpenses(String subOrderNo);
+    TelemarketingAuditOrderEditVo queryExpenses(TelemarketingQueryExpensesVo telemarketingQueryExpensesVo);
 
 }

+ 19 - 11
src/main/java/com/ydtech/modules/order/service/impl/InsTelemarketingOrderServiceImpl.java

@@ -2,8 +2,10 @@ package com.ydtech.modules.order.service.impl;
 
 
 import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
+import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
 import com.ydtech.modules.fee.entity.po.InsFeeTelemarketing;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
+import com.ydtech.modules.fee.service.InsFeeOrderNewHistoryService;
 import com.ydtech.modules.fee.service.InsFeeTelemarketingService;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -13,6 +15,7 @@ import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderEditVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingQueryExpensesVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
@@ -24,6 +27,7 @@ import com.ydtech.modules.protocols.service.PtlAgreementProductCostsExportServic
 import com.ydtech.modules.protocols.service.PtlAgreementProductCostsNewService;
 import com.ydtech.utils.BigDecimalUtils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,17 +44,16 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
 
     private final FeeRuleSchemeNewService feeRuleSchemeNewService;
 
-    private final PtlAgreementProductCostsNewService ptlAgreementProductCostsNewService;
-
     private final InsFeeOrderNewService insFeeOrderNewService;
 
+    private final InsFeeOrderNewHistoryService insFeeOrderNewHistoryService;
+
     private final InsFeeAuditService insFeeAuditService;
 
     private final InsFeeTelemarketingService insFeeTelemarketingService;
 
     private final PtlAgreementProductCostsExportService ptlAgreementProductCostsExportService;
 
-
     @Override
     public BasePageResult<TelemarketingAuditOrderDTO> getOrderList(TelemarketingAuditOrderQueryVo telemarketingAuditOrderQueryVo) {
         return insOrdersService.getTelemarketingAudit(telemarketingAuditOrderQueryVo);
@@ -65,9 +68,7 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
 
         // 出口费用
-        PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.lambdaQuery()
-                .eq(PtlAgreementProductCostsExport::getCostsId, insFeeOrderNew.getCostsId())
-                .one();
+        PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.lambdaQuery().eq(PtlAgreementProductCostsExport::getCostsId, insFeeOrderNew.getCostsId()).one();
 
         String state = submitExportFeesVo.getState();
         boolean equals = "0".equals(state);
@@ -112,12 +113,19 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
     }
 
     @Override
-    public TelemarketingAuditOrderEditVo queryExpenses(String subOrderNo) {
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
-        // 费用信息
-        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
+    public TelemarketingAuditOrderEditVo queryExpenses(TelemarketingQueryExpensesVo telemarketingQueryExpensesVo) {
+        String state = telemarketingQueryExpensesVo.getState();
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(telemarketingQueryExpensesVo.getSubOrderId());
+        InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
+        if ("1".equals(state)) {
+            // 费用信息
+            insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
+            return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
+        } else {
+            InsFeeOrderNewHistory insFeeOrderNewHistory = insFeeOrderNewHistoryService.getByInsOrderNo(insAreaCompany.getId());
+            BeanUtils.copyProperties(insFeeOrderNewHistory, insFeeOrderNew);
+        }
         return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
     }
 
-
 }

+ 175 - 0
src/main/resources/mapper/modules/fee/InsFeeOrderNewHistoryMapper.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.fee.dao.InsFeeOrderNewHistoryMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="insOrderNo" column="ins_order_no" jdbcType="VARCHAR"/>
+            <result property="agreementId" column="agreement_id" jdbcType="BIGINT"/>
+            <result property="costsId" column="costs_id" jdbcType="VARCHAR"/>
+            <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
+            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+            <result property="jqPremium" column="jq_premium" jdbcType="DECIMAL"/>
+            <result property="syPremium" column="sy_premium" jdbcType="DECIMAL"/>
+            <result property="noPremium" column="no_premium" jdbcType="DECIMAL"/>
+            <result property="jqNoTaxPremium" column="jq_no_tax_premium" jdbcType="DECIMAL"/>
+            <result property="syNoTaxPremium" column="sy_no_tax_premium" jdbcType="DECIMAL"/>
+            <result property="noNoTaxPremium" column="no_no_tax_premium" jdbcType="DECIMAL"/>
+            <result property="jqCostsProportion" column="jq_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="jqCostsPremiums" column="jq_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="syCostsProportion" column="sy_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="syCostsPremiums" column="sy_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="noCostsProportion" column="no_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="noCostsPremiums" column="no_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="jqSuperviseCostsProportion" column="jq_supervise_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="jqSuperviseCostsPremiums" column="jq_supervise_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="sySuperviseCostsProportion" column="sy_supervise_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="sySuperviseCostsPremiums" column="sy_supervise_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="noSuperviseCostsProportion" column="no_supervise_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="noSuperviseCostsPremiums" column="no_supervise_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="jqOtherCostsProportion" column="jq_other_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="jqOtherCostsPremiums" column="jq_other_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="syOtherCostsProportion" column="sy_other_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="syOtherCostsPremiums" column="sy_other_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="noOtherCostsProportion" column="no_other_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="noOtherCostsPremiums" column="no_other_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="jqInvestmentCostsProportion" column="jq_investment_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="jqInvestmentCostsPremiums" column="jq_investment_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="syInvestmentCostsProportion" column="sy_investment_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="syInvestmentCostsPremiums" column="sy_investment_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="jqDeptProportionLevel1" column="jq_dept_proportion_level_1" jdbcType="DECIMAL"/>
+            <result property="jqDeptPremiumsLevel1" column="jq_dept_premiums_level_1" jdbcType="DECIMAL"/>
+            <result property="syDeptProportionLevel1" column="sy_dept_proportion_level_1" jdbcType="DECIMAL"/>
+            <result property="syDeptPremiumsLevel1" column="sy_dept_premiums_level_1" jdbcType="DECIMAL"/>
+            <result property="noDeptProportionLevel1" column="no_dept_proportion_level_1" jdbcType="DECIMAL"/>
+            <result property="noDeptPremiumsLevel1" column="no_dept_premiums_level_1" jdbcType="DECIMAL"/>
+            <result property="jqDeptProportionLevel2" column="jq_dept_proportion_level_2" jdbcType="DECIMAL"/>
+            <result property="jqDeptPremiumsLevel2" column="jq_dept_premiums_level_2" jdbcType="DECIMAL"/>
+            <result property="syDeptProportionLevel2" column="sy_dept_proportion_level_2" jdbcType="DECIMAL"/>
+            <result property="syDeptPremiumsLevel2" column="sy_dept_premiums_level_2" jdbcType="DECIMAL"/>
+            <result property="noDeptProportionLevel2" column="no_dept_proportion_level_2" jdbcType="DECIMAL"/>
+            <result property="noDeptPremiumsLevel2" column="no_dept_premiums_level_2" jdbcType="DECIMAL"/>
+            <result property="jqDeptProportionLevel3" column="jq_dept_proportion_level_3" jdbcType="DECIMAL"/>
+            <result property="jqDeptPremiumsLevel3" column="jq_dept_premiums_level_3" jdbcType="DECIMAL"/>
+            <result property="syDeptProportionLevel3" column="sy_dept_proportion_level_3" jdbcType="DECIMAL"/>
+            <result property="syDeptPremiumsLevel3" column="sy_dept_premiums_level_3" jdbcType="DECIMAL"/>
+            <result property="noDeptProportionLevel3" column="no_dept_proportion_level_3" jdbcType="DECIMAL"/>
+            <result property="noDeptPremiumsLevel3" column="no_dept_premiums_level_3" jdbcType="DECIMAL"/>
+            <result property="jqDeptProportionLevel4" column="jq_dept_proportion_level_4" jdbcType="DECIMAL"/>
+            <result property="jqDeptPremiumsLevel4" column="jq_dept_premiums_level_4" jdbcType="DECIMAL"/>
+            <result property="syDeptProportionLevel4" column="sy_dept_proportion_level_4" jdbcType="DECIMAL"/>
+            <result property="syDeptPremiumsLevel4" column="sy_dept_premiums_level_4" jdbcType="DECIMAL"/>
+            <result property="noDeptProportionLevel4" column="no_dept_proportion_level_4" jdbcType="DECIMAL"/>
+            <result property="noDeptPremiumsLevel4" column="no_dept_premiums_level_4" jdbcType="DECIMAL"/>
+            <result property="jqDeptProportionLevel5" column="jq_dept_proportion_level_5" jdbcType="DECIMAL"/>
+            <result property="jqDeptPremiumsLevel5" column="jq_dept_premiums_level_5" jdbcType="DECIMAL"/>
+            <result property="syDeptProportionLevel5" column="sy_dept_proportion_level_5" jdbcType="DECIMAL"/>
+            <result property="syDeptPremiumsLevel5" column="sy_dept_premiums_level_5" jdbcType="DECIMAL"/>
+            <result property="noDeptProportionLevel5" column="no_dept_proportion_level_5" jdbcType="DECIMAL"/>
+            <result property="noDeptPremiumsLevel5" column="no_dept_premiums_level_5" jdbcType="DECIMAL"/>
+            <result property="jqCostsExportProportion" column="jq_costs_export_proportion" jdbcType="DECIMAL"/>
+            <result property="syCostsExportProportion" column="sy_costs_export_proportion" jdbcType="DECIMAL"/>
+            <result property="noCostsExportProportion" column="no_costs_export_proportion" jdbcType="DECIMAL"/>
+            <result property="jqExportInvestmentProportion" column="jq_export_investment_proportion" jdbcType="DECIMAL"/>
+            <result property="jqExportInvestmentPremiums" column="jq_export_investment_premiums" jdbcType="DECIMAL"/>
+            <result property="syExportInvestmentProportion" column="sy_export_investment_proportion" jdbcType="DECIMAL"/>
+            <result property="syExportInvestmentPremiums" column="sy_export_investment_premiums" jdbcType="DECIMAL"/>
+            <result property="firstDetailProportion" column="first_detail_proportion" jdbcType="DECIMAL"/>
+            <result property="firstDetailPremiums" column="first_detail_premiums" jdbcType="DECIMAL"/>
+            <result property="secondDetailProportion" column="second_detail_proportion" jdbcType="DECIMAL"/>
+            <result property="secondDetailPremiums" column="second_detail_premiums" jdbcType="DECIMAL"/>
+            <result property="thirdDetailProportion" column="third_detail_proportion" jdbcType="DECIMAL"/>
+            <result property="thirdDetailPremiums" column="third_detail_premiums" jdbcType="DECIMAL"/>
+            <result property="jqRetailProportionLevel1" column="jq_retail_proportion_level_1" jdbcType="DECIMAL"/>
+            <result property="jqRetailPremiumsLevel1" column="jq_retail_premiums_level_1" jdbcType="DECIMAL"/>
+            <result property="syRetailProportionLevel1" column="sy_retail_proportion_level_1" jdbcType="DECIMAL"/>
+            <result property="syRetailPremiumsLevel1" column="sy_retail_premiums_level_1" jdbcType="DECIMAL"/>
+            <result property="noRetailProportionLevel1" column="no_retail_proportion_level_1" jdbcType="DECIMAL"/>
+            <result property="noRetailPremiumsLevel1" column="no_retail_premiums_level_1" jdbcType="DECIMAL"/>
+            <result property="jqRetailProportionLevel2" column="jq_retail_proportion_level_2" jdbcType="DECIMAL"/>
+            <result property="jqRetailPremiumsLevel2" column="jq_retail_premiums_level_2" jdbcType="DECIMAL"/>
+            <result property="syRetailProportionLevel2" column="sy_retail_proportion_level_2" jdbcType="DECIMAL"/>
+            <result property="syRetailPremiumsLevel2" column="sy_retail_premiums_level_2" jdbcType="DECIMAL"/>
+            <result property="noRetailProportionLevel2" column="no_retail_proportion_level_2" jdbcType="DECIMAL"/>
+            <result property="noRetailPremiumsLevel2" column="no_retail_premiums_level_2" jdbcType="DECIMAL"/>
+            <result property="jqRetailProportionLevel3" column="jq_retail_proportion_level_3" jdbcType="DECIMAL"/>
+            <result property="jqRetailPremiumsLevel3" column="jq_retail_premiums_level_3" jdbcType="DECIMAL"/>
+            <result property="syRetailProportionLevel3" column="sy_retail_proportion_level_3" jdbcType="DECIMAL"/>
+            <result property="syRetailPremiumsLevel3" column="sy_retail_premiums_level_3" jdbcType="DECIMAL"/>
+            <result property="noRetailProportionLevel3" column="no_retail_proportion_level_3" jdbcType="DECIMAL"/>
+            <result property="noRetailPremiumsLevel3" column="no_retail_premiums_level_3" jdbcType="DECIMAL"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="firstLevelUserId" column="first_level_user_id" jdbcType="VARCHAR"/>
+            <result property="twoLevelUserId" column="two_level_user_id" jdbcType="VARCHAR"/>
+            <result property="threeLevelUserId" column="three_level_user_id" jdbcType="VARCHAR"/>
+            <result property="distributionStatus" column="distribution_status" jdbcType="VARCHAR"/>
+            <result property="deptDistribution" column="dept_distribution" jdbcType="DECIMAL"/>
+            <result property="jqExportSuperviseCostsPremiums" column="jq_export_supervise_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="syExportSuperviseCostsPremiums" column="sy_export_supervise_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="noExportSuperviseCostsPremiums" column="no_export_supervise_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="jqExportOtherCostsProportion" column="jq_export_other_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="syExportOtherCostsProportion" column="sy_export_other_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="noExportOtherCostsProportion" column="no_export_other_costs_proportion" jdbcType="DECIMAL"/>
+            <result property="jqExportOtherCostsPremiums" column="jq_export_other_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="syExportOtherCostsPremiums" column="sy_export_other_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="noExportOtherCostsPremiums" column="no_export_other_costs_premiums" jdbcType="DECIMAL"/>
+            <result property="jqProfitMarginPremiums" column="jq_profit_margin_premiums" jdbcType="DECIMAL"/>
+            <result property="syProfitMarginPremiums" column="sy_profit_margin_premiums" jdbcType="DECIMAL"/>
+            <result property="noProfitMarginPremiums" column="no_profit_margin_premiums" jdbcType="DECIMAL"/>
+            <result property="jqExternalProportion" column="jq_external_proportion" jdbcType="DECIMAL"/>
+            <result property="syExternalProportion" column="sy_external_proportion" jdbcType="DECIMAL"/>
+            <result property="noExternalProportion" column="no_external_proportion" jdbcType="DECIMAL"/>
+            <result property="jqExternalPremiums" column="jq_external_premiums" jdbcType="DECIMAL"/>
+            <result property="syExternalPremiums" column="sy_external_premiums" jdbcType="DECIMAL"/>
+            <result property="noExternalPremiums" column="no_external_premiums" jdbcType="DECIMAL"/>
+            <result property="operatorId" column="operator_id" jdbcType="VARCHAR"/>
+            <result property="operatorTime" column="operator_time" jdbcType="DATE"/>
+            <result property="isFirst" column="is_first" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,ins_order_no,agreement_id,
+        costs_id,dept_id,user_id,
+        jq_premium,sy_premium,no_premium,
+        jq_no_tax_premium,sy_no_tax_premium,no_no_tax_premium,
+        jq_costs_proportion,jq_costs_premiums,sy_costs_proportion,
+        sy_costs_premiums,no_costs_proportion,no_costs_premiums,
+        jq_supervise_costs_proportion,jq_supervise_costs_premiums,sy_supervise_costs_proportion,
+        sy_supervise_costs_premiums,no_supervise_costs_proportion,no_supervise_costs_premiums,
+        jq_other_costs_proportion,jq_other_costs_premiums,sy_other_costs_proportion,
+        sy_other_costs_premiums,no_other_costs_proportion,no_other_costs_premiums,
+        jq_investment_costs_proportion,jq_investment_costs_premiums,sy_investment_costs_proportion,
+        sy_investment_costs_premiums,jq_dept_proportion_level_1,jq_dept_premiums_level_1,
+        sy_dept_proportion_level_1,sy_dept_premiums_level_1,no_dept_proportion_level_1,
+        no_dept_premiums_level_1,jq_dept_proportion_level_2,jq_dept_premiums_level_2,
+        sy_dept_proportion_level_2,sy_dept_premiums_level_2,no_dept_proportion_level_2,
+        no_dept_premiums_level_2,jq_dept_proportion_level_3,jq_dept_premiums_level_3,
+        sy_dept_proportion_level_3,sy_dept_premiums_level_3,no_dept_proportion_level_3,
+        no_dept_premiums_level_3,jq_dept_proportion_level_4,jq_dept_premiums_level_4,
+        sy_dept_proportion_level_4,sy_dept_premiums_level_4,no_dept_proportion_level_4,
+        no_dept_premiums_level_4,jq_dept_proportion_level_5,jq_dept_premiums_level_5,
+        sy_dept_proportion_level_5,sy_dept_premiums_level_5,no_dept_proportion_level_5,
+        no_dept_premiums_level_5,jq_costs_export_proportion,sy_costs_export_proportion,
+        no_costs_export_proportion,jq_export_investment_proportion,jq_export_investment_premiums,
+        sy_export_investment_proportion,sy_export_investment_premiums,first_detail_proportion,
+        first_detail_premiums,second_detail_proportion,second_detail_premiums,
+        third_detail_proportion,third_detail_premiums,jq_retail_proportion_level_1,
+        jq_retail_premiums_level_1,sy_retail_proportion_level_1,sy_retail_premiums_level_1,
+        no_retail_proportion_level_1,no_retail_premiums_level_1,jq_retail_proportion_level_2,
+        jq_retail_premiums_level_2,sy_retail_proportion_level_2,sy_retail_premiums_level_2,
+        no_retail_proportion_level_2,no_retail_premiums_level_2,jq_retail_proportion_level_3,
+        jq_retail_premiums_level_3,sy_retail_proportion_level_3,sy_retail_premiums_level_3,
+        no_retail_proportion_level_3,no_retail_premiums_level_3,create_time,
+        first_level_user_id,two_level_user_id,three_level_user_id,
+        distribution_status,dept_distribution,jq_export_supervise_costs_premiums,
+        sy_export_supervise_costs_premiums,no_export_supervise_costs_premiums,jq_export_other_costs_proportion,
+        sy_export_other_costs_proportion,no_export_other_costs_proportion,jq_export_other_costs_premiums,
+        sy_export_other_costs_premiums,no_export_other_costs_premiums,jq_profit_margin_premiums,
+        sy_profit_margin_premiums,no_profit_margin_premiums,jq_external_proportion,
+        sy_external_proportion,no_external_proportion,jq_external_premiums,
+        sy_external_premiums,no_external_premiums,operator_id,
+        operator_time,is_first
+    </sql>
+</mapper>

+ 4 - 0
src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1648,6 +1648,10 @@
             AND iac.orderno = #{telemarketingAuditOrderQueryVo.orderNo}
         </if>
 
+        <if test="telemarketingAuditOrderQueryVo.auditStatus != null and telemarketingAuditOrderQueryVo.auditStatus != '' ">
+            AND ifa.auditstatus = #{telemarketingAuditOrderQueryVo.auditStatus}
+        </if>
+
         <if test="telemarketingAuditOrderQueryVo.companyId != null and telemarketingAuditOrderQueryVo.companyId != '' ">
             AND iac.company_id = #{telemarketingAuditOrderQueryVo.companyId}
         </if>