From 17a004b47eb77af0a9b2cce4e797a59e17d4add6 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期一, 23 十月 2023 16:39:11 +0800 Subject: [PATCH] # 到处字段调整 配置数据启用逻辑 价格配置文案调整 --- server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java index 920336a..7a81e97 100644 --- a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java +++ b/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; @@ -13,44 +14,45 @@ public class BikeLogDTO { @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; } -- Gitblit v1.9.3