工作组 新增方法

adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java

@@ -2,16 +2,21 @@ package com.adc.da.slrs.wgMeetingInfo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
 
+import com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -40,27 +45,33 @@ public class WgMeetingInfo extends BaseEntity {
 
     @ApiModelProperty(value = "参会时间")
     @TableField("meeting_time")
-    private LocalDateTime meetingTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date meetingTime;
 
     @ApiModelProperty(value = "会议名称")
-    @TableField("meet_name")
+    @TableField("meeting_name")
     private String meetingName;
 
-    @ApiModelProperty(value = "会议人员")
-    @TableField("meeting_people")
-    private String meetingPeople;
-
-    @ApiModelProperty(value = "会议人员名称")
-    @TableField("meeting_people_name")
-    private String meetingPeopleName;
 
     @ApiModelProperty(value = "会议报告")
     @TableField("meeting_report")
     private String meetingReport;
 
     @ApiModelProperty(value = "会议资料")
-    @TableField("meeting_datum")
-    private String meetingDatum;
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+    @ApiModelProperty(value = "人员信息")
+    @TableField(exist = false)
+    private List<String> meetingPeople;
+
+    @TableField(exist = false)
+    private List<WgMeetingUserRelationShow> joinMeetingPeopleInfo;
 
 
 }