From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java
index 5fc2822..5ac3d51 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java
@@ -1,5 +1,7 @@
package com.sinata.system.domain.vo;
+import cn.idev.excel.annotation.ExcelIgnore;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,56 +18,73 @@
public class MwCollectRecordVO {
@ApiModelProperty("收集记录id")
+ @ExcelIgnore
private Long id;
@ApiModelProperty("区域id")
+ @ExcelIgnore
private Long departmentId;
@ApiModelProperty("医院名称")
+ @ExcelProperty(value = "医院", index = 2)
private String hospitalName;
@ApiModelProperty("暂存间id")
+ @ExcelIgnore
private Long stagingRoomId;
@ApiModelProperty("医废编号")
+ @ExcelProperty(value = "医废编号", index = 3)
private String medicalWasteNumber;
@ApiModelProperty("转运箱id")
+ @ExcelIgnore
private Long boxId;
@ApiModelProperty("箱子编号")
+ @ExcelProperty(value = "箱子编号", index = 4)
private String boxNumber;
@ApiModelProperty("医废类型（数据字典id)")
- private Integer wasteType;
+ private Long wasteType;
@ApiModelProperty("医废类型名称")
+ @ExcelProperty(value = "医废类型", index = 5)
private String wasteTypeStr;
@ApiModelProperty("医废重量")
+ @ExcelProperty(value = "医废重量", index = 6)
private BigDecimal weight;
@ApiModelProperty("出库人员id")
+ @ExcelIgnore
private Long checkoutUserId;
@ApiModelProperty("出库人员姓名")
+ @ExcelIgnore
private String checkoutUserName;
@ApiModelProperty("出库时间")
+ @ExcelIgnore
private Date checkoutTime;
@ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
+ @ExcelProperty(value = "医废状态", index = 8)
private Integer status;
@ApiModelProperty("封箱时间")
+ @ExcelIgnore
private Date boxTime;
@ApiModelProperty("收集人id")
+ @ExcelIgnore
private Long collectUserId;
@ApiModelProperty("收集人姓名")
- private Long collectUserName;
+ @ExcelProperty(value = "收集人", index = 7)
+ private String collectUserName;
@ApiModelProperty("收集时间")
+ @ExcelProperty(value = "收集时间", index = 1)
private Date collectTime;
}
--
Gitblit v1.7.1