提交

zhangback

8 天以前 b054362aaf616bfe0be0b50ae5dc2137091dbd7d

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

@@ -63,7 +63,10 @@
        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
        @TableField("created_time")
    private Date createdTime;

    @TableField(exist = false)
    private  String createdTimeBegin;
    @TableField(exist = false)
    private  String createdTimeEnd;

    /** 运输方式 */
    @Excel(name = "运输方式")
@@ -167,21 +170,38 @@
    @Excel(name = "预估总收入")

        @TableField("estimated_total_income")
    private Long estimatedTotalIncome;
    private BigDecimal estimatedTotalIncome;


    /** 预估总成本 */
    @Excel(name = "预估总成本")

        @TableField("estimated_total_cost")
    private Long estimatedTotalCost;
    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 = "预估利润")

        @TableField("estimated_profit")
    private Long estimatedProfit;
    private BigDecimal estimatedProfit;


    /** 电子锁 */
@@ -364,6 +384,28 @@
        /**业务id修改用*/
        @TableField(exist = false)
     private Integer serviceId;
    /**
     * 是否生成过入账0否1是
     */
    @TableField("is_create")
    private Integer isCreate;
    /**
     * 关联账单id
     */
    @TableField("bill_id")
    private Integer billId;
    /** 关联账单状态 */
    @Excel(name = "关联账单状态")
    @TableField("related_bill_status")
    private Integer relatedBillStatus;


    /**
     * 关联账单id
     */
    @Excel(name = "账单名称")
    @TableField("bill_name")
    private String billName;

    public String getActualDepartureTimeBegin() {
        return actualDepartureTimeBegin;
@@ -381,7 +423,21 @@
        this.actualDepartureTimeEnd = actualDepartureTimeEnd==null?actualDepartureTimeEnd:actualDepartureTimeEnd+ " 23:59:59";
    }

    public String getCreatedTimeBegin() {
        return createdTimeBegin;
    }

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

    public String getCreatedTimeEnd() {
        return createdTimeEnd;
    }

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

    public String getRequiredArrivalTimeBegin() {
        return requiredArrivalTimeBegin;