From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index 5f89c12..4ae6fe8 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +23,7 @@
@Data
@ApiModel("浼氳瀹ら瀹氫俊鎭〃")
@TableName("`meeting_book`")
-public class Bookings {
+public class Bookings extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -42,6 +43,7 @@
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="浼氳闇�姹�",index = 7,width = 10)
private String remark;
@ApiModelProperty(value = "浼氳涓婚")
@@ -80,7 +82,7 @@
@ApiModelProperty(value = "浼氳鍐呭")
private String content;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
+ @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉� ")
private Integer status;
@ApiModelProperty(value = "鍙栨秷浜�")
@@ -92,7 +94,22 @@
@ApiModelProperty(value = "鍙戦�侀�氱煡锛�0=鏈彂閫� 1=宸插彂閫�")
private Integer sendNotice;
+ @ApiModelProperty(value = "鍙栨秷澶囨敞")
+ private String cancelInfo;
+ @ApiModelProperty(value = "鎻愬墠缁撴潫浜�")
+ private Integer doneUserId;
+
+ @ApiModelProperty(value = "鎻愬墠缁撴潫鏃堕棿")
+ private Date doneDate;
+
+ @ApiModelProperty(value = "鍙栨秷澶囨敞")
+ private String doneInfo;
+
+ @ApiModelProperty(value = "鎻愬墠寮�濮嬫椂闂�")
+ private Date startTimeReal;
+ @ApiModelProperty(value = "鏄惁鍙戦�佸弬浼氫汉閫氱煡锛�0=閫氱煡锛�1=涓嶉�氱煡")
+ private Integer joinNotice;
@ApiModelProperty(value = "棰勭害浜�")
@TableField(exist = false)
@@ -123,10 +140,16 @@
@ApiModelProperty(value = "userId")
@TableField(exist = false)
private Integer userId ;
+ @ApiModelProperty(value = "鏄惁鍏锋湁鎿嶄綔鏉冮檺(寮�濮嬨�佺粨鏉熴�佹挙鍥烇級")
+ @TableField(exist = false)
+ private Integer hasRole ;
@ApiModelProperty(value = "鍙備細浜哄憳")
@TableField(exist = false)
private List<UserRel> sysList;
+ @ApiModelProperty(value = "浼氳瀹ょ鐞嗗憳")
+ @TableField(exist = false)
+ private List<UserRel> adminList;
@ApiModelProperty(value = "鏈嶅姟椤圭洰")
@TableField(exist = false)
@@ -161,4 +184,35 @@
@ApiModelProperty(value = "weekday")
@TableField(exist = false)
private String weekday;
+
+ @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�")
+ @TableField(exist = false)
+ private Integer meetingStatus;
+
+
+
+ @ApiModelProperty(value = "鏌ヨ鏃ユ湡 yyyy-MM-dd")
+ @TableField(exist = false)
+ private String queryDate;
+
+
+ @ApiModelProperty(value = "鏌ヨ绫诲埆锛�1=鎴戝弬涓庣殑锛�2=鎴戦绾︾殑锛�")
+ @TableField(exist = false)
+ private Integer queryType;
+
+
+ @ApiModelProperty(value = "浼氳瀹ゅ悕绉�")
+ @TableField(exist = false)
+ private String roomsName;
+
+ @ApiModelProperty(value = "浼氳瀹や富閿�")
+ @TableField(exist = false)
+ private Integer roomsId;
+ @ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
+ @TableField(exist = false)
+ private String imgurl;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏂囦欢绫诲瀷")
+ private Integer fileType;
}
--
Gitblit v1.9.3