From 9f7882497b0395e277388957a428e9b8cfcba93b Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Fri, 24 Oct 2025 16:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E5=B7=A5=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/{sql => updatesql}/20250728假数据表.sql | 0 db/{sql => updatesql}/20250916-应急资源.sql | 0 .../20250917-新加用户扩展信息.sql | 0 .../20250926-应急表工单表加字段.sql | 0 .../20251024-应急工单表参与人员信息.sql | 14 +++++ .../emergency/entity/OrderOperator.java | 63 +++++++++++++++++++ 6 files changed, 77 insertions(+) rename db/{sql => updatesql}/20250728假数据表.sql (100%) rename db/{sql => updatesql}/20250916-应急资源.sql (100%) rename db/{sql => updatesql}/20250917-新加用户扩展信息.sql (100%) rename db/{sql => updatesql}/20250926-应急表工单表加字段.sql (100%) create mode 100644 db/updatesql/20251024-应急工单表参与人员信息.sql create mode 100644 health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/OrderOperator.java diff --git a/db/sql/20250728假数据表.sql b/db/updatesql/20250728假数据表.sql similarity index 100% rename from db/sql/20250728假数据表.sql rename to db/updatesql/20250728假数据表.sql diff --git a/db/sql/20250916-应急资源.sql b/db/updatesql/20250916-应急资源.sql similarity index 100% rename from db/sql/20250916-应急资源.sql rename to db/updatesql/20250916-应急资源.sql diff --git a/db/sql/20250917-新加用户扩展信息.sql b/db/updatesql/20250917-新加用户扩展信息.sql similarity index 100% rename from db/sql/20250917-新加用户扩展信息.sql rename to db/updatesql/20250917-新加用户扩展信息.sql diff --git a/db/sql/20250926-应急表工单表加字段.sql b/db/updatesql/20250926-应急表工单表加字段.sql similarity index 100% rename from db/sql/20250926-应急表工单表加字段.sql rename to db/updatesql/20250926-应急表工单表加字段.sql diff --git a/db/updatesql/20251024-应急工单表参与人员信息.sql b/db/updatesql/20251024-应急工单表参与人员信息.sql new file mode 100644 index 0000000..52cf6ad --- /dev/null +++ b/db/updatesql/20251024-应急工单表参与人员信息.sql @@ -0,0 +1,14 @@ +-- ---------------------------- +-- Table structure for emergency_order_operator +-- ---------------------------- +CREATE TABLE `emergency_order_operator` ( + `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'id', + `order_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '应急工单ID', + `operator_type` int(11) NOT NULL COMMENT '人员类型(人员类型0:操作人员 1:专业人员)', + `user_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '人员ID', + `join_type` int(11) NOT NULL COMMENT '参与类型(0:处理应急,1:协助应急)', + `join_date` datetime NOT NULL COMMENT '参与应急时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/OrderOperator.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/OrderOperator.java new file mode 100644 index 0000000..631dd57 --- /dev/null +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/OrderOperator.java @@ -0,0 +1,63 @@ +package com.renkang.emergency.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: emergency_order_operator 应急工单操作人员表,记录工单所有参与或协助应急的人员信息 + * @Author: feng + * @Date: 2025-10-24 + * @Version: V1.0 + */ +@Data +@TableName("emergency_order_operator") +@Schema(title = "应急工单操作人员表", description = "应急工单操作人员表") +public class OrderOperator implements Serializable { + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(title = "id") + private String id; + + /** + * 应急工单ID + */ + @Schema(title = "应急工单ID") + private String orderId; + + /** + * 人员类型(人员类型0:操作人员 1:专业人员) + */ + @Schema(title = "人员类型(人员类型0:操作人员 1:专业人员)") + private Integer operatorType; + + /** + * 人员ID + */ + @Schema(title = "人员ID") + private String userId; + + /** + * 参与类型(0:处理应急,1:协助应急) + */ + @Schema(title = "参与类型(0:处理应急,1:协助应急)") + private Integer joinType; + + /** + * 参与应急时间 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(title = "参与应急时间") + private Date joinDate; + +}