From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 28 二月 2025 18:25:00 +0800 Subject: [PATCH] 111 --- server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java index 5f4db32..a346c3a 100644 --- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java +++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java @@ -1,41 +1,74 @@ package com.doumee.dao.business.web.response; import com.doumee.core.annotation.excel.ExcelColumn; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import java.math.BigDecimal; import java.util.Date; /** * @author T14 */ @Data +@ApiModel("楠戣璁板綍杩斿洖") public class MemberRidesDTO { + @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 = "鏄惁缁撶畻") + @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅") + private Integer type; + @ApiModelProperty(value = "杞﹁締绫诲瀷") + @ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER) + private String bikeType; + @ApiModelProperty(value = "濂楅鎶垫墸浠锋牸锛堝垎锛�") + private BigDecimal discountPrice; + @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER) + private Integer closeStatus; + + @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�") +// @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER) private Integer status; - @ApiModelProperty(value = "杞﹁締绫诲瀷") - @ExcelColumn(name="杞﹁締绫诲瀷") - private String bikeType; - @ApiModelProperty(value = "楠戣鏃堕暱") + @ExcelColumn(name="楠戣鏃堕暱锛堝垎)",index = 6,width = 10,align = HorizontalAlignment.CENTER) private Integer rideTime; @ApiModelProperty(value = "璁¤垂鏃堕暱") + @ExcelColumn(name="璁¤垂鏃堕暱锛堝垎)",index = 7,width = 10,align = HorizontalAlignment.CENTER) private Integer duration; @ApiModelProperty(value = "绉熻溅鏃堕棿") + @ExcelColumn(name="绉熻溅鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date rentDate; @ApiModelProperty(value = "杩樿溅鏃堕棿") - @ExcelColumn(name="杩樿溅鏃堕棿") + @ExcelColumn(name="杩樿溅鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date backDate; + @ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜") + private String rentSiteId; + + @ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜") + private String rentLockId; + + + @ApiModelProperty(value = "杩樿溅绔欑偣缂栫爜") +// @ExcelColumn(name="褰掕繕绔欑偣",index = 7,width = 10,align = HorizontalAlignment.CENTER) + private String backSiteId; + + @ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜") +// @ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER) + private String backLockId; } -- Gitblit v1.9.3