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/MwWarningRecord.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java
index c162a5f..d96e886 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java
@@ -3,13 +3,16 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.sinata.common.entity.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -20,11 +23,13 @@
* @author mitao
* @since 2024-12-02
*/
-@Getter
-@Setter
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("MW_WARNING_RECORD")
@ApiModel(value = "MwWarningRecord对象", description = "预警记录表")
-public class MwWarningRecord extends BaseModel {
+public class MwWarningRecord implements Serializable {
private static final long serialVersionUID = 1L;
@@ -44,7 +49,9 @@
@TableField("WARNING_TARGET_NAME")
private String warningTargetName;
- @ApiModelProperty("预警类型 1：医疗废物预警 2：合同预警 3：人员预警 4：职业防护预警 5：入库暂存间存储容量预警")
+ @ApiModelProperty("预警类型 1：出库超时预警 2：暂存间使用率预警 3：合同到期预警 4：健康记录预警 " +
+ "5：疫苗记录预警 6：防护用品使用预警 7：防护用品库存预警 8：医疗机构产废日预警 " +
+ "9：医疗机构产废月预警 10：医疗机构存储量预警 11：车辆转运异常预警 12:处置单位存储量预警")
@TableField("TYPE")
private Integer type;
@@ -56,5 +63,55 @@
@TableField("STATUS")
private Integer status;
+ @ApiModelProperty("单位id")
+ @TableField("DEPARTMENT_ID")
+ private Long departmentId;
+ @ApiModelProperty("单位名称")
+ @TableField("DEPARTMENT_NAME")
+ private String departmentName;
+
+ @ApiModelProperty("预警值")
+ @TableField("CURRENT_VALUE")
+ private String currentValue;
+
+ @ApiModelProperty("正常范围")
+ @TableField("NORMAL_RANGE")
+ private String normalRange;
+
+ /**
+ * 创建者
+ */
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @TableField(value = "create_by")
+ private Long createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /**
+ * 更新者
+ */
+ @ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by")
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField(value = "update_time")
+ private Date updateTime;
+
+ /**
+ * 是否删除 0未删除 1已删除
+ */
+ @TableField("del_flag")
+ @ApiModelProperty(value = "是否删除 0未删除 1已删除")
+ @TableLogic
+ private Integer delFlag;
}
--
Gitblit v1.7.1