From 05628d269dff7ad4f2e9d3419b05b4e7e5768797 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 12 二月 2025 14:19:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 5ac3d51..3a2193d 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
@@ -2,6 +2,9 @@
import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.ExcelProperty;
+import com.sinata.system.annotation.FastExcel;
+import com.sinata.system.conveter.EConverter;
+import com.sinata.system.enums.MedicalWasteStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,7 +29,7 @@
private Long departmentId;
@ApiModelProperty("医院名称")
- @ExcelProperty(value = "医院", index = 2)
+ @ExcelProperty(value = "医院", index = 1)
private String hospitalName;
@ApiModelProperty("暂存间id")
@@ -34,7 +37,7 @@
private Long stagingRoomId;
@ApiModelProperty("医废编号")
- @ExcelProperty(value = "医废编号", index = 3)
+ @ExcelProperty(value = "医废编号", index = 2)
private String medicalWasteNumber;
@ApiModelProperty("转运箱id")
@@ -42,18 +45,19 @@
private Long boxId;
@ApiModelProperty("箱子编号")
- @ExcelProperty(value = "箱子编号", index = 4)
+ @ExcelProperty(value = "箱子编号", index = 3)
private String boxNumber;
@ApiModelProperty("医废类型（数据字典id)")
+ @ExcelIgnore
private Long wasteType;
@ApiModelProperty("医废类型名称")
- @ExcelProperty(value = "医废类型", index = 5)
+ @ExcelProperty(value = "医废类型", index = 4)
private String wasteTypeStr;
@ApiModelProperty("医废重量")
- @ExcelProperty(value = "医废重量", index = 6)
+ @ExcelProperty(value = "医废重量", index = 5)
private BigDecimal weight;
@ApiModelProperty("出库人员id")
@@ -69,7 +73,8 @@
private Date checkoutTime;
@ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
- @ExcelProperty(value = "医废状态", index = 8)
+ @ExcelProperty(value = "医废状态", index = 7, converter = EConverter.class)
+ @FastExcel(type = MedicalWasteStatusEnum.class)
private Integer status;
@ApiModelProperty("封箱时间")
@@ -81,10 +86,10 @@
private Long collectUserId;
@ApiModelProperty("收集人姓名")
- @ExcelProperty(value = "收集人", index = 7)
+ @ExcelProperty(value = "收集人", index = 6)
private String collectUserName;
@ApiModelProperty("收集时间")
- @ExcelProperty(value = "收集时间", index = 1)
+ @ExcelProperty(value = "收集时间", index = 0)
private Date collectTime;
}
--
Gitblit v1.7.1