From d17d4d1ac98865d2a71b4f24771b7b76e0839ed3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 10 四月 2026 14:08:41 +0800
Subject: [PATCH] yys 1.设备区域 2.设备巡检，维保，保养多选 3.数采
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 79 +++++++++++----------------------------
1 files changed, 23 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
index 09c5f40..b26c193 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -1,89 +1,56 @@
package com.ruoyi.device.execl;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
@Data
public class DeviceLedgerExeclDto {
+ @Excel(name = "璁惧绫诲瀷", sort = 0, combo = {"鐢熶骇璁惧", "鍔炲叕璁惧", "妫�娴嬭澶�", "杩愯緭璁惧", "鍏朵粬璁惧"})
+ private String type;
- /**
- * 璁惧鍚嶇О
- */
- @Excel(name = "璁惧鍚嶇О" ,sort = 1)
+ @Excel(name = "璁惧鍚嶇О", sort = 1)
private String deviceName;
- /**
- * 瑙勬牸鍨嬪彿
- */
- @Excel(name = "瑙勬牸鍨嬪彿" ,sort = 2)
+ @Excel(name = "瑙勬牸鍨嬪彿", sort = 2)
private String deviceModel;
- /**
- * 渚涘簲鍟嗗悕绉�
- */
- @Excel(name = "渚涘簲鍟嗗悕绉�",sort = 3)
+ @Excel(name = "渚涘簲鍟嗗悕绉�", sort = 3)
private String supplierName;
- /**
- * 鍗曚綅
- */
- @Excel(name = "鍗曚綅",sort = 4)
+ @Excel(name = "鍗曚綅", sort = 4)
private String unit;
- /**
- * 鏁伴噺
- */
- @Excel(name = "鏁伴噺",sort = 5)
- private BigDecimal number;
+ @Excel(name = "鏁伴噺", sort = 5, type = Excel.Type.EXPORT)
+ private BigDecimal number = BigDecimal.ONE;
- /**
- * 鍚◣鍗曚环
- */
- @Excel(name = "鍚◣鍗曚环",sort = 6)
+ @Excel(name = "鍚◣鍗曚环", sort = 6)
private BigDecimal taxIncludingPriceUnit;
- /**
- * 鍚◣鎬讳环
- */
- @Excel(name = "鍚◣鎬讳环",sort = 7)
+ @Excel(name = "鍚◣鎬讳环", sort = 7, type = Excel.Type.EXPORT)
private BigDecimal taxIncludingPriceTotal;
- /**
- * 绋庣巼
- */
- @Excel(name = "绋庣巼",sort = 8)
+ @Excel(name = "绋庣巼", sort = 8)
private BigDecimal taxRate;
- /**
- * 涓嶅惈绋庢�讳环
- */
- @Excel(name = "涓嶅惈绋庢�讳环",sort = 9)
+ @Excel(name = "涓嶅惈绋庢�讳环", sort = 9, type = Excel.Type.EXPORT)
private BigDecimal unTaxIncludingPriceTotal;
-//
-// /**
-// * 褰曞叆鏃堕棿
-// *
-// */
-// @Excel(name = "褰曞叆鏃堕棿",sort = 10)
-// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// private LocalDateTime createTime;
+ @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁″垝杩愯鏃堕棿", sort = 10, dateFormat = "yyyy-MM-dd")
+ private Date planRuntimeTime;
+ @Excel(name = "璁惧鍖哄煙", sort = 11)
+ private String areaName;
- /**
- * 褰曞叆浜�
- */
- @Excel(name = "褰曞叆浜�",sort = 9)
+ @Excel(name = "褰曞叆浜�", sort = 12)
private String createUser;
-
-
-
-
}
--
Gitblit v1.9.3