From 678b01185fda7ffd4d0959ca39be9b3633cb8294 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 01 十二月 2020 19:18:26 +0800
Subject: [PATCH] 活动流程优化

---
 facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java |   54 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java b/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
index 92de943..3af8eaa 100644
--- a/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
+++ b/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
@@ -1,6 +1,8 @@
 package com.ks.lucky.pojo.DO;
 
 import org.springframework.data.annotation.Transient;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
@@ -9,6 +11,7 @@
 import java.util.Date;
 import java.util.List;
 
+@Table("lucky_activity")
 @Valid
 public class LuckyActivity implements Serializable {
 
@@ -44,51 +47,74 @@
     public final static int STATE_OPENED = 41;
 
 
+    @Column(name="id")
     private Long id;
+
+    @Column(name="app_id")
     @NotNull(message = "搴旂敤ID涓嶈兘涓虹┖")
     private Long appId;
 
+    @Column(name="sponsor_id")
     @NotNull(message = "璧炲姪鍟嗕笉鑳戒负绌�")
     private Long sponsorId;
 
+    @Column(name="`name`")
     @NotEmpty(message = "娲诲姩鍚嶇О涓嶈兘涓虹┖")
     private String name;
+
+    @Column(name="material_poster")
     @NotEmpty(message = "娲诲姩娴锋姤涓嶈兘涓虹┖")
     private String materialPoster;
 
+    @Column(name="material_tag_image")
     private String materialTagImage;
 
+    @Column(name="material_")
     private String material;
 
+    @Column(name="`desc`")
     private String desc;
     /**
      * 鏈�澶т汉鏁�
      */
+    @Column(name="max_person_count")
     private Integer maxPersonCount;
 
     /**
      * 鐜版湁浜烘暟
      */
+    @Column(name="current_person_count")
     private Integer currentPersonCount;
 
+    @Column(name="`state`")
     private Integer state;
 
+    @Column(name="state_remarks")
     private String stateRemarks;
 
+    @Column(name="pre_start_time")
     @NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
-    private Date startTime;
+    private Date preStartTime;
 
+    @Column(name="actual_start_time")
+    private Date actualStartTime;
+
+    @Column(name="pre_finish_time")
     private Date preFinishTime;
 
-    @NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
+    @Column(name="actual_finish_time")
     private Date actualFinishTime;
 
+    @Column(name="pre_open_time")
     private Date preOpenTime;
 
+    @Column(name="actual_open_time")
     private Date actualOpenTime;
 
+    @Column(name="create_time")
     private Date createTime;
 
+    @Column(name="update_time")
     private Date updateTime;
 
     @Transient
@@ -232,14 +258,6 @@
         this.stateRemarks = stateRemarks == null ? null : stateRemarks.trim();
     }
 
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
     public Date getPreOpenTime() {
         return preOpenTime;
     }
@@ -279,4 +297,20 @@
     public void setActualFinishTime(Date actualFinishTime) {
         this.actualFinishTime = actualFinishTime;
     }
+
+    public Date getPreStartTime() {
+        return preStartTime;
+    }
+
+    public void setPreStartTime(Date preStartTime) {
+        this.preStartTime = preStartTime;
+    }
+
+    public Date getActualStartTime() {
+        return actualStartTime;
+    }
+
+    public void setActualStartTime(Date actualStartTime) {
+        this.actualStartTime = actualStartTime;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0