From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 02 一月 2025 10:55:24 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/domain/MwWarningRecord.java | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 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..d8093c0 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 @@ -7,8 +7,11 @@ 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.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.util.Date; @@ -20,8 +23,11 @@ * @author mitao * @since 2024-12-02 */ -@Getter -@Setter +@Data +@EqualsAndHashCode(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor @TableName("MW_WARNING_RECORD") @ApiModel(value = "MwWarningRecord对象", description = "预警记录表") public class MwWarningRecord extends BaseModel { @@ -44,7 +50,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 +64,19 @@ @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; } -- Gitblit v1.7.1