活动表字段修改

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationController.java

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
 
 @RestController
 @RequestMapping("/activityEvaluation")
-@Api(value = "活动项目表", tags = "活动项目表")
+@Api(value = "评测活动表", tags = "评测活动表")
 public class ActivityEvaluationController extends BaseController {
 
     @Autowired

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationRecordController.java

@@ -20,7 +20,7 @@ import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
 
 @RestController
 @RequestMapping("/activityEvaluationRecord")
-@Api(value = "活动项目参与记录表", tags = "活动项目参与记录表")
+@Api(value = "评测活动参与记录表", tags = "评测活动参与记录表")
 public class ActivityEvaluationRecordController extends BaseController {
 
     @Autowired

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

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
  * @Author: liweifan
  * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityEvaluationDto对象", description = "活动项目表数据传输对象")
+@ApiModel(value = "ActivityEvaluationDto对象", description = "评测活动表数据传输对象")
 public class ActivityEvaluationDto extends ActivityEvaluation{
 	private static final long serialVersionUID = 1L;
 }

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

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
  * @Author: liweifan
  * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityEvaluationRecordDto对象", description = "活动项目参与记录表数据传输对象")
+@ApiModel(value = "ActivityEvaluationRecordDto对象", description = "评测活动参与记录表数据传输对象")
 public class ActivityEvaluationRecordDto extends ActivityEvaluationRecord{
 	private static final long serialVersionUID = 1L;
 }

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

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
  * @Author: liweifan
  * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityEvaluationRecordSearch对象", description = "活动项目参与记录表查询对象")
+@ApiModel(value = "ActivityEvaluationRecordSearch对象", description = "评测活动参与记录表查询对象")
 public class ActivityEvaluationRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 

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

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
  * @Author: liweifan
  * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityEvaluationSearch对象", description = "活动项目表查询对象")
+@ApiModel(value = "ActivityEvaluationSearch对象", description = "评测活动表查询对象")
 public class ActivityEvaluationSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 

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

@@ -13,79 +13,68 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 活动项目表
+ * 评测活动表
  */
 @TableName("activity_evaluation")
-@ApiModel(value = "ActivityEvaluation对象", description = "活动项目表")
+@ApiModel(value = "ActivityEvaluation对象", description = "评测活动表")
 public class ActivityEvaluation implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     @ApiModelProperty("活动id ")
-	@TableField(value = "activity_id_")
+    @TableField(value = "activity_id_")
     private Long activityId;
-    @ApiModelProperty("业务类型 MUSIC 曲目 ")
-	@TableField(value = "biz_type_")
-    private String bizType;
-    @ApiModelProperty("业务id(曲目id) ")
-	@TableField(value = "biz_id_")
-    private Long bizId;
+    @ApiModelProperty("曲目id ")
+    @TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
     @ApiModelProperty("创建时间 ")
-	@TableField(value = "create_time_")
+    @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
     @ApiModelProperty("创建人 ")
-	@TableField(value = "create_by_")
+    @TableField(value = "create_by_")
     private Long createBy;
 
-	public Long getId() {
+    public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-    
-	public Long getActivityId() {
+
+    public Long getActivityId() {
         return activityId;
     }
 
     public void setActivityId(Long activityId) {
         this.activityId = activityId;
     }
-    
-	public String getBizType() {
-        return bizType;
-    }
 
-    public void setBizType(String bizType) {
-        this.bizType = bizType;
-    }
-    
-	public Long getBizId() {
-        return bizId;
+    public Long getMusicSheetId() {
+        return musicSheetId;
     }
 
-    public void setBizId(Long bizId) {
-        this.bizId = bizId;
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
     }
-    
-	public Date getCreateTime() {
+
+    public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    
-	public Long getCreateBy() {
+
+    public Long getCreateBy() {
         return createBy;
     }
 
     public void setCreateBy(Long createBy) {
         this.createBy = createBy;
     }
-    
+
 }

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

@@ -13,79 +13,79 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 活动项目参与记录表
+ * 评测活动参与记录表
  */
 @TableName("activity_evaluation_record")
-@ApiModel(value = "ActivityEvaluationRecord对象", description = "活动项目参与记录表")
+@ApiModel(value = "ActivityEvaluationRecord对象", description = "评测活动参与记录表")
 public class ActivityEvaluationRecord implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     @ApiModelProperty("活动id ")
-	@TableField(value = "activity_id_")
+    @TableField(value = "activity_id_")
     private Long activityId;
-    @ApiModelProperty("活动项目id ")
-	@TableField(value = "project_id_")
-    private Long projectId;
     @ApiModelProperty("用户id ")
-	@TableField(value = "user_id_")
+    @TableField(value = "user_id_")
     private Long userId;
+    @ApiModelProperty("评测活动id ")
+    @TableField(value = "evaluation_id_")
+    private Long evaluationId;
     @ApiModelProperty("分数 ")
-	@TableField(value = "score_")
+    @TableField(value = "score_")
     private Double score;
     @ApiModelProperty("创建时间 ")
-	@TableField(value = "create_time_")
+    @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
-	public Long getId() {
+    public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-    
-	public Long getActivityId() {
+
+    public Long getActivityId() {
         return activityId;
     }
 
     public void setActivityId(Long activityId) {
         this.activityId = activityId;
     }
-    
-	public Long getProjectId() {
-        return projectId;
-    }
 
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
-    }
-    
-	public Long getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-    
-	public Double getScore() {
+
+    public Long getEvaluationId() {
+        return evaluationId;
+    }
+
+    public void setEvaluationId(Long evaluationId) {
+        this.evaluationId = evaluationId;
+    }
+
+    public Double getScore() {
         return score;
     }
 
     public void setScore(Double score) {
         this.score = score;
     }
-    
-	public Date getCreateTime() {
+
+    public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    
+
 }

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

@@ -18,98 +18,98 @@ import org.springframework.format.annotation.DateTimeFormat;
 @TableName("activity_user_reward")
 @ApiModel(value = "ActivityUserReward对象", description = "活动用户获奖表")
 public class ActivityUserReward implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     @ApiModelProperty("活动id ")
-	@TableField(value = "activity_id_")
+    @TableField(value = "activity_id_")
     private Long activityId;
-    @ApiModelProperty("活动项目id ")
-	@TableField(value = "project_id_")
-    private Long projectId;
+    @ApiModelProperty("活动具体项目id ")
+    @TableField(value = "biz_id_")
+    private Long bizId;
     @ApiModelProperty("用户id ")
-	@TableField(value = "user_id_")
+    @TableField(value = "user_id_")
     private Long userId;
     @ApiModelProperty("奖品id ")
-	@TableField(value = "reward_id_")
+    @TableField(value = "reward_id_")
     private Long rewardId;
     @ApiModelProperty("是否领取奖品 0 否 1 是 ")
-	@TableField(value = "receive_flag_")
+    @TableField(value = "receive_flag_")
     private Integer receiveFlag;
     @ApiModelProperty("创建时间 ")
-	@TableField(value = "create_time_")
+    @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
     @ApiModelProperty("更新时间 ")
-	@TableField(value = "update_time_")
+    @TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-	public Long getId() {
+    public Long getId() {
         return id;
     }
 
     public void setId(Long id) {
         this.id = id;
     }
-    
-	public Long getActivityId() {
+
+    public Long getActivityId() {
         return activityId;
     }
 
     public void setActivityId(Long activityId) {
         this.activityId = activityId;
     }
-    
-	public Long getProjectId() {
-        return projectId;
+
+    public Long getBizId() {
+        return bizId;
     }
 
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
     }
-    
-	public Long getUserId() {
+
+    public Long getUserId() {
         return userId;
     }
 
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-    
-	public Long getRewardId() {
+
+    public Long getRewardId() {
         return rewardId;
     }
 
     public void setRewardId(Long rewardId) {
         this.rewardId = rewardId;
     }
-    
-	public Integer getReceiveFlag() {
+
+    public Integer getReceiveFlag() {
         return receiveFlag;
     }
 
     public void setReceiveFlag(Integer receiveFlag) {
         this.receiveFlag = receiveFlag;
     }
-    
-	public Date getCreateTime() {
+
+    public Date getCreateTime() {
         return createTime;
     }
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    
-	public Date getUpdateTime() {
+
+    public Date getUpdateTime() {
         return updateTime;
     }
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityEvaluationRecordService.java

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
 
 /**
- * 活动项目参与记录表 服务类
+ * 评测活动参与记录表 服务类
  * @author liweifan
  * @date 2022-08-04
  */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityEvaluationService.java

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
 
 /**
- * 活动项目表 服务类
+ * 评测活动表 服务类
  * @author liweifan
  * @date 2022-08-04
  */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityEvaluationRecordVo.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
  * @Author: liweifan
  * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityEvaluationRecordVo对象", description = "活动项目参与记录表查询视图对象")
+@ApiModel(value = "ActivityEvaluationRecordVo对象", description = "评测活动参与记录表查询视图对象")
 public class ActivityEvaluationRecordVo extends ActivityEvaluationRecord{
 	private static final long serialVersionUID = 1L;
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityEvaluationVo.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
  * @Author: liweifan
  * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityEvaluationVo对象", description = "活动项目表查询视图对象")
+@ApiModel(value = "ActivityEvaluationVo对象", description = "评测活动表查询视图对象")
 public class ActivityEvaluationVo extends ActivityEvaluation{
 	private static final long serialVersionUID = 1L;
 }

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

@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation">
-            <result column="id_" property="id" />
-	        <result column="activity_id_" property="activityId" />
-	        <result column="biz_type_" property="bizType" />
-	        <result column="biz_id_" property="bizId" />
-	        <result column="create_time_" property="createTime" />
-	        <result column="create_by_" property="createBy" />
-		</resultMap>  
-    
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation">
+        <result column="id_" property="id" />
+        <result column="activity_id_" property="activityId" />
+        <result column="music_sheet_id_" property="musicSheetId" />
+        <result column="create_time_" property="createTime" />
+        <result column="create_by_" property="createBy" />
+    </resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
-         t.id_ as id
+        t.id_ as id
         , t.activity_id_ as activityId
-        , t.biz_type_ as bizType
-        , t.biz_id_ as bizId
+        , t.music_sheet_id_ as musicSheetId
         , t.create_time_ as createTime
         , t.create_by_ as createBy
-        </sql> 
-    
+    </sql>
+
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
         SELECT
-            <include refid="baseColumns"/>
+        <include refid="baseColumns"/>
         FROM activity_evaluation t
         where t.id_ = #{id}
     </select>
-    
+
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
-		SELECT         
-        	<include refid="baseColumns" />
-		FROM activity_evaluation t
-	</select>
+        SELECT
+        <include refid="baseColumns" />
+        FROM activity_evaluation t
+    </select>
 </mapper>

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

@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationRecordDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord">
-            <result column="id_" property="id" />
-	        <result column="activity_id_" property="activityId" />
-	        <result column="project_id_" property="projectId" />
-	        <result column="user_id_" property="userId" />
-	        <result column="score_" property="score" />
-	        <result column="create_time_" property="createTime" />
-		</resultMap>  
-    
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord">
+        <result column="id_" property="id" />
+        <result column="activity_id_" property="activityId" />
+        <result column="user_id_" property="userId" />
+        <result column="evaluation_id_" property="evaluationId" />
+        <result column="score_" property="score" />
+        <result column="create_time_" property="createTime" />
+    </resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
-         t.id_ as id
+        t.id_ as id
         , t.activity_id_ as activityId
-        , t.project_id_ as projectId
         , t.user_id_ as userId
+        , t.evaluation_id_ as evaluationId
         , t.score_ as score
         , t.create_time_ as createTime
-        </sql> 
-    
+    </sql>
+
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo">
         SELECT
-            <include refid="baseColumns"/>
+        <include refid="baseColumns"/>
         FROM activity_evaluation_record t
         where t.id_ = #{id}
     </select>
-    
+
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo">
-		SELECT         
-        	<include refid="baseColumns" />
-		FROM activity_evaluation_record t
-	</select>
+        SELECT
+        <include refid="baseColumns" />
+        FROM activity_evaluation_record t
+    </select>
 </mapper>

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

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityUserReward">
-            <result column="id_" property="id" />
-	        <result column="activity_id_" property="activityId" />
-	        <result column="project_id_" property="projectId" />
-	        <result column="user_id_" property="userId" />
-	        <result column="reward_id_" property="rewardId" />
-	        <result column="receive_flag_" property="receiveFlag" />
-	        <result column="create_time_" property="createTime" />
-	        <result column="update_time_" property="updateTime" />
-		</resultMap>  
-    
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityUserReward">
+        <result column="id_" property="id" />
+        <result column="activity_id_" property="activityId" />
+        <result column="biz_id_" property="bizId" />
+        <result column="user_id_" property="userId" />
+        <result column="reward_id_" property="rewardId" />
+        <result column="receive_flag_" property="receiveFlag" />
+        <result column="create_time_" property="createTime" />
+        <result column="update_time_" property="updateTime" />
+    </resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
-         t.id_ as id
+        t.id_ as id
         , t.activity_id_ as activityId
-        , t.project_id_ as projectId
+        , t.biz_id_ as bizId
         , t.user_id_ as userId
         , t.reward_id_ as rewardId
         , t.receive_flag_ as receiveFlag
         , t.create_time_ as createTime
         , t.update_time_ as updateTime
-        </sql> 
-    
+    </sql>
+
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo">
         SELECT
-            <include refid="baseColumns"/>
+        <include refid="baseColumns"/>
         FROM activity_user_reward t
         where t.id_ = #{id}
     </select>
-    
+
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo">
-		SELECT         
-        	<include refid="baseColumns" />
-		FROM activity_user_reward t
-	</select>
+        SELECT
+        <include refid="baseColumns" />
+        FROM activity_user_reward t
+    </select>
 </mapper>