From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
index 630454e..c34e629 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
@@ -7,7 +7,17 @@
import java.util.List;
public class EmergencyDrillExecuteDetailRespDTO {
+ //记录人名称
+ private String recordUserName;
+ public String getRecordUserName() {
+ return recordUserName;
+ }
+
+ public void setRecordUserName(String recordUserName) {
+ this.recordUserName = recordUserName;
+ }
+ // 演练名称
private String drillName;
public String getDrillName() {
@@ -19,18 +29,18 @@
}
private Long id;
-
+ //状态 0：待评价 1 ：已评价
private Boolean status;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
-
+ //演练计划id
private Long drillPlanId;
-
+ //记录人uid
private Long recordUserUid;
-
+ //演练过程描述
private String processDesc;
-
+ //人员列表
private List<EmergencyDrillExecuteUserRespDTO> userList;
public Long getId() {
--
Gitblit v1.9.2