From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 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 f91e1ab..ade110e 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 @@ -2,8 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; -import com.doumee.core.model.LoginUserInfo; -import com.doumee.core.model.LoginUserModel; +import com.doumee.service.business.third.model.LoginUserModel; import com.doumee.dao.web.response.PlatformWorkVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,6 +11,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,10 +64,16 @@ @ApiModelProperty(value = "澶囨敞") @ExcelColumn(name="澶囨敞") private String remark; + @ApiModelProperty(value = "led绌洪棽鏂囨") + @ExcelColumn(name="led绌洪棽鏂囨") + private String ledContent; @ApiModelProperty(value = "鐘舵�� 0姝e父 1绂佺敤", example = "1") @ExcelColumn(name="鐘舵�� 0姝e父 1绂佺敤") private Integer status; + @ApiModelProperty(value = "绫诲瀷 0鏁存墭鐩� 1鏁d欢", example = "1") + @ExcelColumn(name="绫诲瀷 0鏁存墭鐩� 1鏁d欢") + private Integer type; @ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1") @ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬") private Integer platformStatus; @@ -141,6 +148,7 @@ @ApiModelProperty(value = "瑙掑害", example = "1") @ExcelColumn(name="瑙掑害") private BigDecimal angle; + @ApiModelProperty(value = "鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�", example = "1") @ExcelColumn(name="鏈堝彴浣滀笟鏁堢巼锛堜竾鏀�/灏忔椂锛�") private BigDecimal workRate; @@ -188,10 +196,14 @@ 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; @@ -211,6 +223,8 @@ @TableField(exist = false) private BigDecimal useRata; + + @ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁") @TableField(exist = false) private PlatformWorkVO platformWorkVO; -- Gitblit v1.9.3