修改

sen

2025-08-18 238c45af2339810d98d05dd10fd1d31068c12938

 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 = "预估利润")
@@ -211,7 +228,10 @@
        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
        @TableField("actual_departure_time")
    private Date actualDepartureTime;

    @TableField(exist = false)
    private  String actualDepartureTimeBegin;
    @TableField(exist = false)
    private  String actualDepartureTimeEnd;

    /** 要求到达时间 */
    @Excel(name = "要求到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -219,7 +239,10 @@
        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
        @TableField("required_arrival_time")
    private Date requiredArrivalTime;

    @TableField(exist = false)
    private  String requiredArrivalTimeBegin;
    @TableField(exist = false)
    private  String requiredArrivalTimeEnd;

    /** 实际到达时间 */
    @Excel(name = "实际到达时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -227,7 +250,10 @@
        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
        @TableField("actual_arrival_time")
    private Date actualArrivalTime;

    @TableField(exist = false)
    private  String actualArrivalTimeBegin;
    @TableField(exist = false)
    private  String actualArrivalTimeEnd;

    /** 是否回程 */
    @Excel(name = "是否回程")
@@ -352,5 +378,81 @@
        @TableField("update_time")
    private Date updateTime;

        /**业务id修改用*/
        @TableField(exist = false)
     private Integer serviceId;
    /**
     * 是否生成过入账0否1是
     */
    @TableField("is_create")
    private Integer isCreate;
    /**
     * 关联账单id
     */
    @TableField("bill_id")
    private Integer billId;

    /**
     * 关联账单id
     */
    @TableField("bill_name")
    private String billName;

    public String getActualDepartureTimeBegin() {
        return actualDepartureTimeBegin;
    }

    public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
        this.actualDepartureTimeBegin = actualDepartureTimeBegin==null?actualDepartureTimeBegin:actualDepartureTimeBegin+ " 00:00:00";
    }

    public String getActualDepartureTimeEnd() {
        return actualDepartureTimeEnd;
    }

    public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
        this.actualDepartureTimeEnd = actualDepartureTimeEnd==null?actualDepartureTimeEnd:actualDepartureTimeEnd+ " 23:59:59";
    }



    public String getRequiredArrivalTimeBegin() {
        return requiredArrivalTimeBegin;
    }

    public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
        this.requiredArrivalTimeBegin = requiredArrivalTimeBegin==null?requiredArrivalTimeBegin:requiredArrivalTimeBegin+ " 00:00:00";
    }

    public String getRequiredArrivalTimeEnd() {
        return requiredArrivalTimeEnd;
    }

    public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
        this.requiredArrivalTimeEnd = requiredArrivalTimeEnd==null?requiredArrivalTimeEnd:requiredArrivalTimeEnd+ " 23:59:59";
    }

    public Date getActualArrivalTime() {
        return actualArrivalTime;
    }

    public void setActualArrivalTime(Date actualArrivalTime) {
        this.actualArrivalTime = actualArrivalTime;
    }

    public String getActualArrivalTimeBegin() {
        return actualArrivalTimeBegin;
    }

    public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
        this.actualArrivalTimeBegin = actualArrivalTimeBegin==null?actualArrivalTimeBegin:actualArrivalTimeBegin+ " 00:00:00";
    }

    public String getActualArrivalTimeEnd() {
        return actualArrivalTimeEnd;
    }

    public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
        this.actualArrivalTimeEnd = actualArrivalTimeEnd==null?actualArrivalTimeEnd:actualArrivalTimeEnd+ " 23:59:59";
    }
}