From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
index 576bef0..a9eafa8 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -1,12 +1,14 @@
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.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.util.Date;
@Data
public class DeviceLedgerExeclDto {
@@ -17,6 +19,18 @@
*/
@Excel(name = "璁惧鍚嶇О" ,sort = 1)
private String deviceName;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ @Excel(name = "璁惧绫诲瀷",sort = 0,combo = {"鐢熶骇璁惧","鍔炲叕璁惧","妫�鏌ヨ澶�","杩愯緭璁惧","鍏朵粬璁惧"})
+ private String type;
+
+ @Schema(description = "璁″垝杩愯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁″垝杩愯鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd")
+ private Date planRuntimeTime;
/**
* 瑙勬牸鍨嬪彿
@@ -39,8 +53,8 @@
/**
* 鏁伴噺
*/
- @Excel(name = "鏁伴噺",sort = 5)
- private BigDecimal number;
+ @Excel(name = "鏁伴噺",sort = 5, type = Excel.Type.EXPORT)
+ private BigDecimal number = BigDecimal.ONE;
/**
* 鍚◣鍗曚环
@@ -51,7 +65,7 @@
/**
* 鍚◣鎬讳环
*/
- @Excel(name = "鍚◣鎬讳环",sort = 7)
+ @Excel(name = "鍚◣鎬讳环",sort = 7, type = Excel.Type.EXPORT)
private BigDecimal taxIncludingPriceTotal;
/**
@@ -63,16 +77,8 @@
/**
* 涓嶅惈绋庢�讳环
*/
- @Excel(name = "涓嶅惈绋庢�讳环",sort = 9)
+ @Excel(name = "涓嶅惈绋庢�讳环",sort = 9, type = Excel.Type.EXPORT)
private BigDecimal unTaxIncludingPriceTotal;
-
- /**
- * 褰曞叆鏃堕棿
- *
- */
- @Excel(name = "褰曞叆鏃堕棿",sort = 10)
- private LocalDateTime createTime;
-
/**
--
Gitblit v1.9.3