From 7de15911c90c5861d6e26e29550b6c60b09952c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:30:20 +0800
Subject: [PATCH] 修复
---
server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
index 3ee20dd..e87fb89 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -26,7 +29,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +38,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -54,13 +57,18 @@
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜(鍏宠仈bike_types琛級")
private String bikeTypeId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜(鍏宠仈bike_types琛級")
+ @ExcelColumn(name="杞﹁締绫诲瀷缂栫爜(鍏宠仈bike_types琛級")
+ @TableField(exist = false)
+ private String bikeTypeName;
+
@ApiModelProperty(value = "宸ヤ綔鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛�", example = "1")
- @ExcelColumn(name="宸ヤ綔鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛�")
+ @ExcelColumn(name="宸ヤ綔鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛� -1 琛ㄧず涓�鍙ｄ环")
private Integer baseTime;
@ApiModelProperty(value = "宸ヤ綔鏃ヨ捣姝ヤ环鏍硷紙鍒嗭級", example = "1")
@ExcelColumn(name="宸ヤ綔鏃ヨ捣姝ヤ环鏍硷紙鍒嗭級")
- private Integer basePrice;
+ private BigDecimal basePrice;
@ApiModelProperty(value = "宸ヤ綔鏃ヨ秴鍑烘椂闂达紙鍒嗛挓锛�", example = "1")
@ExcelColumn(name="宸ヤ綔鏃ヨ秴鍑烘椂闂达紙鍒嗛挓锛�")
@@ -68,7 +76,7 @@
@ApiModelProperty(value = "宸ヤ綔鏃ヨ秴鍑轰环鏍硷紙鍒嗭級", example = "1")
@ExcelColumn(name="宸ヤ綔鏃ヨ秴鍑轰环鏍硷紙鍒嗭級")
- private Integer unitPrice;
+ private BigDecimal unitPrice;
@ApiModelProperty(value = "鑺傚亣鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛�", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛�")
@@ -76,7 +84,7 @@
@ApiModelProperty(value = "鑺傚亣鏃ヨ捣姝ヤ环鏍硷紙鍒嗭級", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ捣姝ヤ环鏍硷紙鍒嗭級")
- private Integer holidayBasePrice;
+ private BigDecimal holidayBasePrice;
@ApiModelProperty(value = "鑺傚亣鏃ヨ秴鍑烘椂闂达紙鍒嗛挓锛�", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ秴鍑烘椂闂达紙鍒嗛挓锛�")
@@ -84,7 +92,7 @@
@ApiModelProperty(value = "鑺傚亣鏃ヨ秴鍑烘椂闂村崟浠凤紙鍒嗭級", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ秴鍑烘椂闂村崟浠凤紙鍒嗭級")
- private Integer holidayUnitPrice;
+ private BigDecimal holidayUnitPrice;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
--
Gitblit v1.9.3