From 0184bf471382f9328df9bdd47acf451e4e2c5cb0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 11 六月 2025 13:57:37 +0800
Subject: [PATCH] 达梦数据库及数据库脚本

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwWarningRecordVO.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwWarningRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwWarningRecordVO.java
index fc352ea..b09da2e 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwWarningRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwWarningRecordVO.java
@@ -1,5 +1,6 @@
 package com.sinata.system.domain.vo;
 
+import cn.idev.excel.annotation.ExcelIgnore;
 import cn.idev.excel.annotation.ExcelProperty;
 import com.sinata.system.annotation.FastExcel;
 import com.sinata.system.conveter.EConverter;
@@ -20,37 +21,43 @@
 public class MwWarningRecordVO {
 
     @ApiModelProperty("预警记录id")
+    @ExcelIgnore
     private Long id;
 
     @ApiModelProperty("预警时间")
-    @ExcelProperty(value = "预警时间", index = 1)
+    @ExcelProperty(value = "预警时间", index = 0)
     private Date warnTime;
 
     @ApiModelProperty("预警对象id")
+    @ExcelIgnore
     private Long warningTargetId;
 
     @ApiModelProperty("预警对象")
-    @ExcelProperty(value = "预警对象", index = 2)
+    @ExcelProperty(value = "预警对象", index = 1)
     private String warningTargetName;
 
-    @ApiModelProperty("预警类型 1:出库超时预警;2:暂存间使用率预警;3:合同到期预警;4:健康记录预警;5:疫苗记录预警;6:防护用品使用预警;7:医疗机构产废日预警;8:医疗机构产废月预警;9:医疗机构存储量预警;10:车辆转运异常预警;11:处置单位存储量预警")
-    @ExcelProperty(value = "预警类型", index = 3, converter = EConverter.class)
+    @ApiModelProperty("预警类型 1:出库超时预警 2:暂存间使用率预警 3:合同到期预警 4:健康记录预警 \" +\n" +
+            "            \"5:疫苗记录预警 6:防护用品使用预警 7:防护用品库存预警  8:医疗机构产废日预警 \" +\n" +
+            "            \"9:医疗机构产废月预警 10:医疗机构存储量预警 11:车辆转运异常预警 12:处置单位存储量预警")
+    @ExcelProperty(value = "预警类型", index = 2, converter = EConverter.class)
     @FastExcel(type = WarningTypeEnum.class)
     private Integer type;
 
     @ApiModelProperty("预警消息")
-    @ExcelProperty(value = "预警消息", index = 4)
+    @ExcelProperty(value = "预警信息", index = 3)
     private String message;
 
     @ApiModelProperty("预警状态 1:未解除;2:已解除")
-    @ExcelProperty(value = "预警状态", index = 5)
+    @ExcelProperty(value = "预警状态", index = 4, converter = EConverter.class)
     @FastExcel(type = WarningStatusEnum.class)
     private Integer status;
 
     @ApiModelProperty("单位id")
+    @ExcelIgnore
     private Long departmentId;
 
     @ApiModelProperty("单位名称")
+    @ExcelIgnore
     private String departmentName;
 
 }

--
Gitblit v1.7.1