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/MwStorageRecordVO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwStorageRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwStorageRecordVO.java
index 7c5a15a..9b69223 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwStorageRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwStorageRecordVO.java
@@ -1,5 +1,6 @@
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;
@@ -15,10 +16,13 @@
@Data
@ApiModel("暂存间入库视图对象")
public class MwStorageRecordVO {
+
@ApiModelProperty("收集记录id")
+ @ExcelIgnore
private Long id;
@ApiModelProperty("区域id")
+ @ExcelIgnore
private Long departmentId;
@ApiModelProperty("医院名称")
@@ -26,6 +30,7 @@
private String hospitalName;
@ApiModelProperty("暂存间id")
+ @ExcelIgnore
private Long stagingRoomId;
@ApiModelProperty("暂存间名称")
@@ -37,11 +42,16 @@
private String medicalWasteNumber;
@ApiModelProperty("转运箱id")
+ @ExcelIgnore
private Long boxId;
@ApiModelProperty("箱子编号")
@ExcelProperty(value = "箱子编号", index = 5)
private String boxNumber;
+
+ @ApiModelProperty("袋数")
+ @ExcelIgnore
+ private Integer bagNum;
@ApiModelProperty("医废类型（数据字典id)")
private Integer wasteType;
@@ -55,12 +65,15 @@
private BigDecimal weight;
@ApiModelProperty("出库人员id")
+ @ExcelIgnore
private Long checkoutUserId;
@ApiModelProperty("出库人员姓名")
+ @ExcelIgnore
private String checkoutUserName;
@ApiModelProperty("出库时间")
+ @ExcelIgnore
private Date checkoutTime;
@ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
@@ -68,9 +81,11 @@
private Integer status;
@ApiModelProperty("封箱时间")
+ @ExcelIgnore
private Date boxTime;
@ApiModelProperty("收集人id")
+ @ExcelIgnore
private Long collectUserId;
@ApiModelProperty("入库人员")
@@ -80,4 +95,5 @@
@ApiModelProperty("入库时间")
@ExcelProperty(value = "入库时间", index = 1)
private Date collectTime;
+
}
--
Gitblit v1.7.1