From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 b86c513..0838def 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,10 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -48,19 +53,26 @@
@ApiModelProperty(value = "瀹氫环鏂规缂栫爜(鍏宠仈price_param)")
@ExcelColumn(name="瀹氫环鏂规缂栫爜(鍏宠仈price_param)")
+ @NotBlank(message = "瀹氫环鏂规缂栫爜涓嶅厑璁镐负绌�")
private String pricePramId;
@ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜(鍏宠仈bike_types琛級")
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜(鍏宠仈bike_types琛級")
+ @NotBlank(message = "杞﹁締绫诲瀷涓嶅厑璁镐负绌�")
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 +80,7 @@
@ApiModelProperty(value = "宸ヤ綔鏃ヨ秴鍑轰环鏍硷紙鍒嗭級", example = "1")
@ExcelColumn(name="宸ヤ綔鏃ヨ秴鍑轰环鏍硷紙鍒嗭級")
- private Integer unitPrice;
+ private BigDecimal unitPrice;
@ApiModelProperty(value = "鑺傚亣鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛�", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ捣姝ユ椂闂达紙鍒嗛挓锛�")
@@ -76,7 +88,7 @@
@ApiModelProperty(value = "鑺傚亣鏃ヨ捣姝ヤ环鏍硷紙鍒嗭級", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ捣姝ヤ环鏍硷紙鍒嗭級")
- private Integer holidayBasePrice;
+ private BigDecimal holidayBasePrice;
@ApiModelProperty(value = "鑺傚亣鏃ヨ秴鍑烘椂闂达紙鍒嗛挓锛�", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ秴鍑烘椂闂达紙鍒嗛挓锛�")
@@ -84,7 +96,7 @@
@ApiModelProperty(value = "鑺傚亣鏃ヨ秴鍑烘椂闂村崟浠凤紙鍒嗭級", example = "1")
@ExcelColumn(name="鑺傚亣鏃ヨ秴鍑烘椂闂村崟浠凤紙鍒嗭級")
- private Integer holidayUnitPrice;
+ private BigDecimal holidayUnitPrice;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -94,4 +106,9 @@
@ExcelColumn(name="瑙勫垯鍚嶇О")
private String title;
+ @ApiModelProperty(value = "鎺掑簭鐮侊紙鍗囧簭锛�", example = "1")
+ @ExcelColumn(name="鎺掑簭鐮侊紙鍗囧簭锛�")
+ @TableField(exist = false)
+ private Integer sortnum;
+
}
--
Gitblit v1.9.3