From 701d5ca0fb3da20fb336d66e08f4aa3c6b85c731 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 29 十一月 2024 09:37:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 74e4fe0..f733483 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -12,6 +12,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -63,6 +65,9 @@
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
+ @ApiModelProperty(value = "led绌洪棽鏂囨")
+ @ExcelColumn(name="led绌洪棽鏂囨")
+ private String ledContent;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
@@ -187,6 +192,34 @@
@TableField(exist = false)
private String workCarCode;
+ @ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd", example = "1")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryDateStart;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd", example = "1")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryDateEnd;
+
+ @ApiModelProperty(value = "鍋滈潬娆℃暟", example = "1")
+ @TableField(exist = false)
+ private Integer stopCount;
+
+ @ApiModelProperty(value = "宸ヤ綔鏃堕暱 鍗曚綅h", example = "1")
+ @TableField(exist = false)
+ private BigDecimal workCountTime;
+
+ @ApiModelProperty(value = "鏈堝彴宸ヤ綔寮�鏀炬椂闀�" ,hidden = true)
+ @TableField(exist = false)
+ private BigDecimal openTime ;
+
+ @ApiModelProperty(value = "浣跨敤鐜�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal useRata;
+
@ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁")
--
Gitblit v1.9.3