增加分享活动老师信息

.gitignore

@@ -1,4 +1,5 @@
 /target/
+logback-test.xml
 
 ### STS ###
 .apt_generated

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ActivityResourceEnum.java

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 活动资源类型
+ *
+ * @Author: liweifan
+ * @Data: 2022/4/7 15:48
+ */
+public enum ActivityResourceEnum implements BaseEnum<String, ActivityResourceEnum> {
+
+    MUSIC_SHEET("曲谱"),
+    TEACHER("老师"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    ActivityResourceEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ActivityShareEnum.java

@@ -0,0 +1,39 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 活动分类类型
+ *
+ * @Author: liweifan
+ * @Data: 2022/4/7 15:48
+ */
+public enum ActivityShareEnum implements BaseEnum<String, ActivityShareEnum> {
+
+    MUSIC_SHEET("曲谱"),
+    MUSIC("音乐"),
+    VIDEO("视频"),
+    LIVE("直播"),
+    GOODS("商品"),
+    DEFAULT("默认"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    ActivityShareEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ActivityTypeEnum.java

@@ -13,6 +13,7 @@ public enum ActivityTypeEnum implements BaseEnum<String, ActivityTypeEnum> {
 
     EVALUATION("评测活动"),
     STANDARD_GIFT("达标赠送"),
+    SHARE("活动分享"),
     ;
 
     @EnumValue

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/ActivityTeacherInfoRequest.java

@@ -0,0 +1,11 @@
+package com.yonge.cooleshow.admin.io.request;
+
+import java.io.Serializable;
+
+/**
+ * 分享活动参与老师信息请求
+ * <p>
+ * Created by Eric.Shang on 2022/8/29.
+ */
+public class ActivityTeacherInfoRequest implements Serializable {
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/response/ActivityTeacherResponse.java

@@ -0,0 +1,11 @@
+package com.yonge.cooleshow.admin.io.response;
+
+import java.io.Serializable;
+
+/**
+ * 分享活动参与老师信息响应
+ * <p>
+ * Created by Eric.Shang on 2022/8/29.
+ */
+public class ActivityTeacherResponse implements Serializable {
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityPlanSearch.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
@@ -9,9 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.Date;
 
 /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlan.java

@@ -4,22 +4,21 @@ 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 com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.common.enums.ActivityShareEnum;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.cooleshow.common.enums.RegistrationMethodEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Optional;
 
 /**
  * 活动计划表
@@ -92,6 +91,9 @@ public class ActivityPlan implements Serializable {
     @ApiModelProperty("发奖状态（完成状态） 0 未发奖 1 已发奖 ")
     @TableField(value = "reward_flag_")
     private Integer rewardFlag;
+    @ApiModelProperty(value = "活动分类类型")
+    @TableField(value = "share_type_")
+    private ActivityShareEnum shareType;
     @ApiModelProperty("创建时间 ")
     @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -213,6 +215,14 @@ public class ActivityPlan implements Serializable {
         this.activityState = activityState;
     }
 
+    public ActivityShareEnum getShareType() {
+        return Optional.ofNullable(shareType).orElse(ActivityShareEnum.DEFAULT);
+    }
+
+    public void setShareType(ActivityShareEnum shareType) {
+        this.shareType = shareType;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanMapper.xml

@@ -72,14 +72,17 @@
             <if test="param.draftFlag != null">
                 and t.draft_flag_ = #{param.draftFlag}
             </if>
-            <if test="param.activityState != null">
-                <if test="param.activityState == 0">
-                    and (t.activity_state_ = 0 or t.activity_state_ = 2)
-                </if>
-                <if test="param.activityState == 1">
-                    and t.activity_state_ = 1
-                </if>
-            </if>
+            <choose>
+                <when test="param.activityState != null">
+                    <if test="param.activityState == 0">
+                        and (t.activity_state_ = 0 or t.activity_state_ = 2)
+                    </if>
+                    <if test="param.activityState == 1">
+                        and t.activity_state_ = 1
+                    </if>
+                </when>
+                <otherwise> AND t.activity_start_ &gt;= -1 </otherwise>
+            </choose>
             <if test="param.startTime !=null">
                 and t.activity_start_ &gt;= #{param.startTime}
             </if>

pom.xml

@@ -280,6 +280,18 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<!--增加lombok编译-->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>