新增字段

wujianwei

2025-08-15 8776c82342ede39fe894dec9a5e0ace216d1c99d

新增字段

 service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java

@@ -176,6 +176,23 @@
        @TableField("estimated_total_cost")
    private BigDecimal estimatedTotalCost;

    /** 确认总收入 */
    @Excel(name = "确认总收入")
    @TableField("confirmed_total_income")
    private BigDecimal confirmedTotalIncome;
    /** 确认总成本 */
    @Excel(name = "确认总成本")
    @TableField("confirmed_total_cost")
    private BigDecimal confirmedTotalCost;

    /**是否匹配收入(0:未匹配;1:已匹配)*/
    @TableField("is_income_matched")
    private Integer isIncomeMatched;

    /**是否匹配成本(0:未匹配;1:已匹配)*/
    @TableField("is_cost_matched")
    private Integer isCostMatched;


    /** 预估利润 */
    @Excel(name = "预估利润")

 service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml

@@ -56,10 +56,14 @@
        <result property="isCreate"    column="is_create"    />
        <result property="billId"    column="bill_id"    />
        <result property="billName"    column="bill_name"    />
        <result property="confirmedTotalIncome"    column="confirmed_total_income"    />
        <result property="confirmedTotalCost"    column="confirmed_total_cost"    />
        <result property="isIncomeMatched"    column="is_income_matched"    />
        <result property="isCostMatched"    column="is_cost_matched"    />
    </resultMap>

    <sql id="selectPendingSettlementBusinessVo">
        select thisTab.id, thisTab.booking_no, thisTab.customer_id, thisTab.carrier_id, thisTab.project_name, thisTab.dispatch_no, thisTab.created_time, thisTab.transport_mode, thisTab.product_id, thisTab.customer_name, thisTab.operation_mode, thisTab.carrier_name, thisTab.departure_location, thisTab.arrival_location, thisTab.vehicle_id, thisTab.license_plate_number, thisTab.vehicle_type, thisTab.main_driver, thisTab.assistant_driver, thisTab.point_num, thisTab.business_contact, thisTab.estimated_total_income, thisTab.estimated_total_cost, thisTab.estimated_profit, thisTab.electronic_lock, thisTab.re_weighing_weight, thisTab.quantity, thisTab.actual_departure_time, thisTab.required_arrival_time, thisTab.actual_arrival_time, thisTab.be_return, thisTab.dispatch_quantity, thisTab.dispatch_weight, thisTab.dispatch_volume, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.heavy_mileage, thisTab.heavy_fuel, thisTab.be_scheduled, thisTab.tracking_no, thisTab.seal_no, thisTab.schedule_no, thisTab.transport_status, thisTab.estimated_bill_id, thisTab.settlement_bill_id, thisTab.bill_id, thisTab.settlement_status, thisTab.create_time, thisTab.update_time, thisTab.is_create, thisTab.bill_name from pending_settlement_business AS thisTab
        select thisTab.id, thisTab.booking_no, thisTab.customer_id, thisTab.carrier_id, thisTab.project_name, thisTab.dispatch_no, thisTab.created_time, thisTab.transport_mode, thisTab.product_id, thisTab.customer_name, thisTab.operation_mode, thisTab.carrier_name, thisTab.departure_location, thisTab.arrival_location, thisTab.vehicle_id, thisTab.license_plate_number, thisTab.vehicle_type, thisTab.main_driver, thisTab.assistant_driver, thisTab.point_num, thisTab.business_contact, thisTab.estimated_total_income, thisTab.estimated_total_cost, thisTab.estimated_profit, thisTab.electronic_lock, thisTab.re_weighing_weight, thisTab.quantity, thisTab.actual_departure_time, thisTab.required_arrival_time, thisTab.actual_arrival_time, thisTab.be_return, thisTab.dispatch_quantity, thisTab.dispatch_weight, thisTab.dispatch_volume, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.heavy_mileage, thisTab.heavy_fuel, thisTab.be_scheduled, thisTab.tracking_no, thisTab.seal_no, thisTab.schedule_no, thisTab.transport_status, thisTab.estimated_bill_id, thisTab.settlement_bill_id, thisTab.bill_id, thisTab.settlement_status, thisTab.create_time, thisTab.update_time, thisTab.is_create, thisTab.bill_name, thisTab.confirmed_total_income, thisTab.confirmed_total_cost, thisTab.is_income_matched, thisTab.is_cost_matched from pending_settlement_business AS thisTab
    </sql>
    <sql id="selectPendingSettlementBusinessVoCount">
        select count(0) from pending_settlement_business as thisTab
@@ -105,6 +109,10 @@
        <if test="billId != null "> and thisTab.bill_id = #{billId}</if>
        <if test="heavyMileage != null "> and thisTab.heavy_mileage = #{heavyMileage}</if>
        <if test="heavyFuel != null "> and thisTab.heavy_fuel = #{heavyFuel}</if>
        <if test="confirmedTotalIncome != null "> and thisTab.confirmed_total_income = #{confirmedTotalIncome}</if>
        <if test="confirmedTotalCost != null "> and thisTab.confirmed_total_cost = #{confirmedTotalCost}</if>
        <if test="isIncomeMatched != null "> and thisTab.is_income_matched = #{isIncomeMatched}</if>
        <if test="isCostMatched != null "> and thisTab.is_cost_matched = #{isCostMatched}</if>
        <if test="beScheduled != null  and beScheduled != ''"> and thisTab.be_scheduled = #{beScheduled}</if>
        <if test="trackingNo != null  and trackingNo != ''"> and thisTab.tracking_no = #{trackingNo}</if>
        <if test="sealNo != null  and sealNo != ''"> and thisTab.seal_no = #{sealNo}</if>
@@ -337,6 +345,10 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="isCreate != null">is_create,</if>
            <if test="confirmedTotalIncome != null">confirmed_total_income,</if>
            <if test="confirmedTotalCost != null">confirmed_total_cost,</if>
            <if test="isIncomeMatched != null">is_income_matched,</if>
            <if test="isCostMatched != null">is_cost_matched,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="bookingNo != null">#{bookingNo},</if>
@@ -387,6 +399,10 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="isCreate != null">#{isCreate},</if>
            <if test="confirmedTotalIncome != null">#{confirmedTotalIncome},</if>
            <if test="confirmedTotalCost != null">#{confirmedTotalCost},</if>
            <if test="isIncomeMatched != null">#{isIncomeMatched},</if>
            <if test="isCostMatched != null">#{isCostMatched},</if>
         </trim>
    </insert>