From 9eaf711b027f60a67a33cb5259e06c21bab620d7 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 01 四月 2025 17:54:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
index c41be07..9e0d994 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/SysDepartment.java
@@ -10,6 +10,8 @@
import lombok.Getter;
import lombok.Setter;
+import java.math.BigDecimal;
+
/**
* <p>
* 区域表
@@ -36,7 +38,7 @@
@ApiModelProperty("上级区域id")
@TableField("PARENT_ID")
- private Integer parentId;
+ private Long parentId;
@ApiModelProperty("树编码")
@TableField("TREE_CODE")
@@ -49,6 +51,10 @@
@ApiModelProperty("机构编码")
@TableField("ORG_CODE")
private String orgCode;
+
+ @ApiModelProperty("层级关系")
+ @TableField("RELATION")
+ private String relation;
@ApiModelProperty("单位地址")
@TableField("ADDRESS")
@@ -82,5 +88,29 @@
@TableField("UNIFIED_SOCIAL_CREDIT_CODE")
private String unifiedSocialCreditCode;
+ @ApiModelProperty("区域")
+ @TableField("REGION")
+ private String region;
+ @ApiModelProperty("医院-暂存间最大数量")
+ @TableField(exist = false)
+ private Integer maxCapacity;
+ @ApiModelProperty("医院-现在存入数量")
+ @TableField(exist = false)
+ private Integer nowCapacity;
+ @ApiModelProperty("医院-百分比")
+ @TableField(exist = false)
+ private String percentage;
+ @ApiModelProperty("处置-库存总")
+ @TableField(exist = false)
+ private BigDecimal cont1;
+ @ApiModelProperty("处置-今日接收")
+ @TableField(exist = false)
+ private BigDecimal cont2;
+ @ApiModelProperty("处置-今日处置")
+ @TableField(exist = false)
+ private BigDecimal cont3;
+ @ApiModelProperty("当前预警量")
+ @TableField(exist = false)
+ private Long dangerCount;
}
--
Gitblit v1.7.1