From 0852acae13603be95eaaa0b501f3441508ff3fe5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 14 四月 2025 09:52:12 +0800
Subject: [PATCH] 大屏统计修改

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMicroEquipmentRecordVO.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMicroEquipmentRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMicroEquipmentRecordVO.java
index 480a3d4..e9527c2 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMicroEquipmentRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMicroEquipmentRecordVO.java
@@ -1,11 +1,15 @@
 package com.sinata.system.domain.vo;
 
+import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.format.DateTimeFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author mitao
@@ -16,29 +20,48 @@
 public class MwMicroEquipmentRecordVO {
 
     @ApiModelProperty("设备使用记录id")
+    @ExcelIgnore
     private Long id;
 
     @ApiModelProperty("医院名称")
+    @ExcelProperty(value = "医院名称", index = 0)
     private String hospitalName;
 
     @ApiModelProperty("设备名称")
+    @ExcelProperty(value = "设备名称", index = 1)
     private String equipmentName;
 
+    @ApiModelProperty("设备id")
+    @ExcelIgnore
+    private Long equipmentId;
+
     @ApiModelProperty("使用时间")
+    @ExcelProperty(value = "使用时间", index = 2)
+    @DateTimeFormat(value = "yyyy-MM-dd HH:mm:ss")
     private Date useTime;
 
     @ApiModelProperty("处理箱数")
+    @ExcelProperty(value = "处理箱数", index = 3)
     private Integer boxNum;
 
     @ApiModelProperty("处理袋数")
+    @ExcelProperty(value = "处理袋数", index = 4)
     private Integer bagNum;
 
     @ApiModelProperty("处理重量")
+    @ExcelProperty(value = "处理重量(kg)", index = 5)
     private BigDecimal totalWeight;
 
     @ApiModelProperty("操作人员")
+    @ExcelProperty(value = "操作人员", index = 6)
     private String nickName;
 
     @ApiModelProperty("备注")
+    @ExcelProperty(value = "备注", index = 7)
     private String remark;
+
+    @ApiModelProperty("医废列表")
+    @ExcelIgnore
+    private List<MwStorageRecordVO> medicalWasteList;
 }
+

--
Gitblit v1.7.1