Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java

@@ -3,6 +3,7 @@
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;

import java.util.Date;

@@ -12,45 +13,57 @@
@Data
public class BikeLogDTO {

    @ApiModelProperty(value = "编码")
    private String id;

    @ApiModelProperty(value = "用户OpenID")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "车辆编号")
    @ExcelColumn(name="车辆编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeCode;

    @ApiModelProperty(value = "车辆类型")
    @ExcelColumn(name="车辆类型",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeType;

    @ApiModelProperty(value = "租车站点编码")
    @ExcelColumn(name="借出站点",index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private String rentSiteId;

    @ApiModelProperty(value = "租车站点编码")
    private String rentSiteName;

    @ApiModelProperty(value = "租车锁头编码")
    @ExcelColumn(name="借出锁具",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private String rentLockId;

    @ApiModelProperty(value = "租车锁头编码")
    private String rentLockName;

    @ApiModelProperty(value = "骑行时长")
    @ExcelColumn(name="借出时长(分)",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Integer rideTime;
    @ApiModelProperty(value = "计费时长")
//    @ExcelColumn(name="计费时长",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Integer duration;

    @ApiModelProperty(value = "租车时间")
    @ApiModelProperty(value = "借出时间")
    @ExcelColumn(name="借出时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date rentDate;

    @ApiModelProperty(value = "还车站点编码")
    @ApiModelProperty(value = "还车站点")
    @ExcelColumn(name="归还站点",index = 10,width = 10,align = HorizontalAlignment.CENTER)
    private String backSiteId;

    @ApiModelProperty(value = "还车站点编码")
    private String backSiteName;

    @ApiModelProperty(value = "还车锁头编码")
    @ExcelColumn(name="归还锁具",index = 12,width = 10,align = HorizontalAlignment.CENTER)
    private String backLockId;

    @ApiModelProperty(value = "还车锁头编码")
    private String backLockName;

    @ApiModelProperty(value = "还车时间")
    @ExcelColumn(name="归还时间",index = 14,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date backDate;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
//    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;

    @ApiModelProperty(value = "结算状态")
//    @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,width = 10,align = HorizontalAlignment.CENTER)
    private Integer closeStatus;
}