Merge branch 'dev_1_2_20220802' of http://git.dayaedu.com/yonge/cooleshow into dev_1_2_20220802

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
+
+@RestController
+@RequestMapping("/activityEvaluation")
+@Api(value = "活动项目表", tags = "活动项目表")
+public class ActivityEvaluationController extends BaseController {
+
+    @Autowired
+    private ActivityEvaluationService activityEvaluationService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityEvaluationVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityEvaluationService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityEvaluationSearch")
+    public HttpResponseResult<PageInfo<ActivityEvaluationVo>> page(@RequestBody ActivityEvaluationSearch query) {
+		IPage<ActivityEvaluationVo> pages = activityEvaluationService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityEvaluation")
+	public HttpResponseResult save(@Valid @RequestBody ActivityEvaluation activityEvaluation) {
+    	return status(activityEvaluationService.save(activityEvaluation));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityEvaluation")
+	public HttpResponseResult update(@Valid @RequestBody ActivityEvaluation activityEvaluation) {
+        return status(activityEvaluationService.updateById(activityEvaluation));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityEvaluation")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityEvaluation activityEvaluation) {
+        return status(activityEvaluationService.saveOrUpdate(activityEvaluation));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityEvaluationService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
+
+@RestController
+@RequestMapping("/activityEvaluationRecord")
+@Api(value = "活动项目参与记录表", tags = "活动项目参与记录表")
+public class ActivityEvaluationRecordController extends BaseController {
+
+    @Autowired
+    private ActivityEvaluationRecordService activityEvaluationRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityEvaluationRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityEvaluationRecordService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityEvaluationRecordSearch")
+    public HttpResponseResult<PageInfo<ActivityEvaluationRecordVo>> page(@RequestBody ActivityEvaluationRecordSearch query) {
+		IPage<ActivityEvaluationRecordVo> pages = activityEvaluationRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityEvaluationRecord")
+	public HttpResponseResult save(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
+    	return status(activityEvaluationRecordService.save(activityEvaluationRecord));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityEvaluationRecord")
+	public HttpResponseResult update(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
+        return status(activityEvaluationRecordService.updateById(activityEvaluationRecord));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityEvaluationRecord")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
+        return status(activityEvaluationRecordService.saveOrUpdate(activityEvaluationRecord));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityEvaluationRecordService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+
+@RestController
+@RequestMapping("/activityPlan")
+@Api(value = "活动计划表", tags = "活动计划表")
+public class ActivityPlanController extends BaseController {
+
+    @Autowired
+    private ActivityPlanService activityPlanService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityPlanVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityPlanService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityPlanSearch")
+    public HttpResponseResult<PageInfo<ActivityPlanVo>> page(@RequestBody ActivityPlanSearch query) {
+		IPage<ActivityPlanVo> pages = activityPlanService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityPlan")
+	public HttpResponseResult save(@Valid @RequestBody ActivityPlan activityPlan) {
+    	return status(activityPlanService.save(activityPlan));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityPlan")
+	public HttpResponseResult update(@Valid @RequestBody ActivityPlan activityPlan) {
+        return status(activityPlanService.updateById(activityPlan));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityPlan")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityPlan activityPlan) {
+        return status(activityPlanService.saveOrUpdate(activityPlan));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityPlanService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRegistrationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
+import com.yonge.cooleshow.biz.dal.service.ActivityRegistrationService;
+
+@RestController
+@RequestMapping("/activityRegistration")
+@Api(value = "活动报名表", tags = "活动报名表")
+public class ActivityRegistrationController extends BaseController {
+
+    @Autowired
+    private ActivityRegistrationService activityRegistrationService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityRegistrationVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityRegistrationService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityRegistrationSearch")
+    public HttpResponseResult<PageInfo<ActivityRegistrationVo>> page(@RequestBody ActivityRegistrationSearch query) {
+		IPage<ActivityRegistrationVo> pages = activityRegistrationService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityRegistration")
+	public HttpResponseResult save(@Valid @RequestBody ActivityRegistration activityRegistration) {
+    	return status(activityRegistrationService.save(activityRegistration));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityRegistration")
+	public HttpResponseResult update(@Valid @RequestBody ActivityRegistration activityRegistration) {
+        return status(activityRegistrationService.updateById(activityRegistration));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityRegistration")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityRegistration activityRegistration) {
+        return status(activityRegistrationService.saveOrUpdate(activityRegistration));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityRegistrationService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
+
+@RestController
+@RequestMapping("/activityReward")
+@Api(value = "活动奖品表", tags = "活动奖品表")
+public class ActivityRewardController extends BaseController {
+
+    @Autowired
+    private ActivityRewardService activityRewardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityRewardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityRewardService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityRewardSearch")
+    public HttpResponseResult<PageInfo<ActivityRewardVo>> page(@RequestBody ActivityRewardSearch query) {
+		IPage<ActivityRewardVo> pages = activityRewardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityReward")
+	public HttpResponseResult save(@Valid @RequestBody ActivityReward activityReward) {
+    	return status(activityRewardService.save(activityReward));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityReward")
+	public HttpResponseResult update(@Valid @RequestBody ActivityReward activityReward) {
+        return status(activityRewardService.updateById(activityReward));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityReward")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityReward activityReward) {
+        return status(activityRewardService.saveOrUpdate(activityReward));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityRewardService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import com.yonge.toolset.base.util.StringUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+
+@RestController
+@RequestMapping("/activityUserReward")
+@Api(value = "活动用户获奖表", tags = "活动用户获奖表")
+public class ActivityUserRewardController extends BaseController {
+
+    @Autowired
+    private ActivityUserRewardService activityUserRewardService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<ActivityUserRewardVo> detail(@PathVariable("id") Long id) {
+    	return succeed(activityUserRewardService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入activityUserRewardSearch")
+    public HttpResponseResult<PageInfo<ActivityUserRewardVo>> page(@RequestBody ActivityUserRewardSearch query) {
+		IPage<ActivityUserRewardVo> pages = activityUserRewardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入activityUserReward")
+	public HttpResponseResult save(@Valid @RequestBody ActivityUserReward activityUserReward) {
+    	return status(activityUserRewardService.save(activityUserReward));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入activityUserReward")
+	public HttpResponseResult update(@Valid @RequestBody ActivityUserReward activityUserReward) {
+        return status(activityUserRewardService.updateById(activityUserReward));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入activityUserReward")
+	public HttpResponseResult submit(@Valid @RequestBody ActivityUserReward activityUserReward) {
+        return status(activityUserRewardService.saveOrUpdate(activityUserReward));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(activityUserRewardService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,64 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomChangeRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import com.yonge.cooleshow.biz.dal.service.PianoRoomChangeRecordService;
+
+@RestController
+@RequestMapping("/pianoRoomChangeRecord")
+@Api(value = "琴房时长变更记录表", tags = "琴房时长变更记录表")
+public class PianoRoomChangeRecordController extends BaseController {
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private PianoRoomChangeRecordService pianoRoomChangeRecordService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<PianoRoomChangeRecordVo> detail(@PathVariable("id") Long id) {
+    	return succeed(pianoRoomChangeRecordService.detail(id));
+	}
+    
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入pianoRoomChangeRecordSearch")
+    public HttpResponseResult<PageInfo<PianoRoomChangeRecordVo>> page(@RequestBody PianoRoomChangeRecordSearch query) {
+		IPage<PianoRoomChangeRecordVo> pages = pianoRoomChangeRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/add")
+	@ApiOperation(value = "新增", notes = "传入pianoRoomChangeRecord")
+	public HttpResponseResult add(@Valid @RequestBody PianoRoomChangeRecord pianoRoomChangeRecord) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		pianoRoomChangeRecord.setCreateBy(user.getId());
+    	return status(pianoRoomChangeRecordService.add(pianoRoomChangeRecord));
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityEvaluationDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+
+
+public interface ActivityEvaluationDao extends BaseMapper<ActivityEvaluation>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo
+	 */
+	ActivityEvaluationVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo
+	 */
+	List<ActivityEvaluationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityEvaluationSearch activityEvaluation);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityEvaluationRecordDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+
+
+public interface ActivityEvaluationRecordDao extends BaseMapper<ActivityEvaluationRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo
+	 */
+	ActivityEvaluationRecordVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo
+	 */
+	List<ActivityEvaluationRecordVo> selectPage(@Param("page") IPage page, @Param("param") ActivityEvaluationRecordSearch activityEvaluationRecord);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanDao.java

@@ -14,7 +14,7 @@ public interface ActivityPlanDao extends BaseMapper<ActivityPlan>{
 	/**
 	 * 查询详情
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
 	 */
 	ActivityPlanVo detail(@Param("id") Long id);
@@ -22,7 +22,7 @@ public interface ActivityPlanDao extends BaseMapper<ActivityPlan>{
 	/**
 	 * 分页查询
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
 	 */
 	List<ActivityPlanVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanSearch activityPlan);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanEvaluationDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanEvaluationSearch;
+
+
+public interface ActivityPlanEvaluationDao extends BaseMapper<ActivityPlanEvaluation>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo
+	 */
+	ActivityPlanEvaluationVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo
+	 */
+	List<ActivityPlanEvaluationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanEvaluationSearch activityPlanEvaluation);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityProjectDao.java

@@ -1,30 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
-import com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectSearch;
-
-
-public interface ActivityProjectDao extends BaseMapper<ActivityProject>{
-	/**
-	 * 查询详情
-     * @author liweifan
-     * @date 2022-08-03 10:36:44
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo
-	 */
-	ActivityProjectVo detail(@Param("id") Long id);
-
-	/**
-	 * 分页查询
-     * @author liweifan
-     * @date 2022-08-03 10:36:44
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo
-	 */
-	List<ActivityProjectVo> selectPage(@Param("page") IPage page, @Param("param") ActivityProjectSearch activityProject);
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityProjectRecordDao.java

@@ -1,30 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
-import com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectRecordSearch;
-
-
-public interface ActivityProjectRecordDao extends BaseMapper<ActivityProjectRecord>{
-	/**
-	 * 查询详情
-     * @author liweifan
-     * @date 2022-08-03 10:36:44
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo
-	 */
-	ActivityProjectRecordVo detail(@Param("id") Long id);
-
-	/**
-	 * 分页查询
-     * @author liweifan
-     * @date 2022-08-03 10:36:44
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo
-	 */
-	List<ActivityProjectRecordVo> selectPage(@Param("page") IPage page, @Param("param") ActivityProjectRecordSearch activityProjectRecord);
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityRegistrationDao.java

@@ -14,7 +14,7 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 	/**
 	 * 查询详情
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
 	 */
 	ActivityRegistrationVo detail(@Param("id") Long id);
@@ -22,7 +22,7 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 	/**
 	 * 分页查询
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRegistrationVo
 	 */
 	List<ActivityRegistrationVo> selectPage(@Param("page") IPage page, @Param("param") ActivityRegistrationSearch activityRegistration);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityRewardDao.java

@@ -14,7 +14,7 @@ public interface ActivityRewardDao extends BaseMapper<ActivityReward>{
 	/**
 	 * 查询详情
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
 	 */
 	ActivityRewardVo detail(@Param("id") Long id);
@@ -22,7 +22,7 @@ public interface ActivityRewardDao extends BaseMapper<ActivityReward>{
 	/**
 	 * 分页查询
      * @author liweifan
-     * @date 2022-08-03 10:36:44
+     * @date 2022-08-04 10:19:49
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo
 	 */
 	List<ActivityRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityRewardSearch activityReward);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityUserAwardDao.java

@@ -1,30 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
-import com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserAwardSearch;
-
-
-public interface ActivityUserAwardDao extends BaseMapper<ActivityUserAward>{
-	/**
-	 * 查询详情
-     * @author liweifan
-     * @date 2022-08-03 10:36:44
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo
-	 */
-	ActivityUserAwardVo detail(@Param("id") Long id);
-
-	/**
-	 * 分页查询
-     * @author liweifan
-     * @date 2022-08-03 10:36:44
-     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo
-	 */
-	List<ActivityUserAwardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserAwardSearch activityUserAward);
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityUserRewardDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+
+
+public interface ActivityUserRewardDao extends BaseMapper<ActivityUserReward>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo
+	 */
+	ActivityUserRewardVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-04 10:19:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo
+	 */
+	List<ActivityUserRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserRewardSearch activityUserReward);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentDao.java

@@ -1,19 +0,0 @@
-//package com.yonge.cooleshow.biz.dal.dao;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudent;
-//import com.yonge.cooleshow.biz.dal.vo.CourseScheduleStudentVo;
-//
-//import java.util.List;
-//
-///**
-// * @Author: cy
-// * @Date: 2022/5/27
-// */
-//public interface CourseScheduleStudentDao extends BaseMapper<CourseScheduleStudent> {
-//    //批量添加学员
-//    void insertBatch(List<CourseScheduleStudent> list);
-//
-//    //查询课程对应的老师学员
-//    List<CourseScheduleStudentVo> selectUser();
-//}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/PianoRoomChangeRecordDao.java

@@ -0,0 +1,30 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomChangeRecordSearch;
+
+
+public interface PianoRoomChangeRecordDao extends BaseMapper<PianoRoomChangeRecord>{
+	/**
+	 * 查询详情
+     * @author liweifan
+     * @date 2022-08-03 16:44:34
+     * @return: com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo
+	 */
+	PianoRoomChangeRecordVo detail(@Param("id") Long id);
+
+	/**
+	 * 分页查询
+     * @author liweifan
+     * @date 2022-08-03 16:44:34
+     * @return: com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo
+	 */
+	List<PianoRoomChangeRecordVo> selectPage(@Param("page") IPage page, @Param("param") PianoRoomChangeRecordSearch pianoRoomChangeRecord);
+	
+}

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@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/ActivityPlanDto.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityPlanDto对象", description = "活动计划表数据传输对象")
 public class ActivityPlanDto extends ActivityPlan{

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityPlanEvaluationDto对象", description = "活动计划表数据传输对象")
+public class ActivityPlanEvaluationDto extends ActivityPlanEvaluation{
+	private static final long serialVersionUID = 1L;
+}

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dto;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
- */
-@ApiModel(value = "ActivityProjectDto对象", description = "活动项目表数据传输对象")
-public class ActivityProjectDto extends ActivityProject{
-	private static final long serialVersionUID = 1L;
-}

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dto;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
- */
-@ApiModel(value = "ActivityProjectRecordDto对象", description = "活动项目参与记录表数据传输对象")
-public class ActivityProjectRecordDto extends ActivityProjectRecord{
-	private static final long serialVersionUID = 1L;
-}

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRegistrationDto对象", description = "活动报名表数据传输对象")
 public class ActivityRegistrationDto extends ActivityRegistration{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRewardDto对象", description = "活动奖品表数据传输对象")
 public class ActivityRewardDto extends ActivityReward{

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dto;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
- */
-@ApiModel(value = "ActivityUserAwardDto对象", description = "活动用户获奖表数据传输对象")
-public class ActivityUserAwardDto extends ActivityUserAward{
-	private static final long serialVersionUID = 1L;
-}

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityUserRewardDto对象", description = "活动用户获奖表数据传输对象")
+public class ActivityUserRewardDto extends ActivityUserReward{
+	private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 16:44:34
+ */
+@ApiModel(value = "PianoRoomChangeRecordDto对象", description = "琴房时长变更记录表数据传输对象")
+public class PianoRoomChangeRecordDto extends PianoRoomChangeRecord{
+	private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,14 @@
+package com.yonge.cooleshow.biz.dal.dto.search;
+
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@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/ActivityProjectSearch.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityEvaluationSearch.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityProjectSearch对象", description = "活动项目表查询对象")
-public class ActivityProjectSearch extends QueryInfo{
+@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/dto/search/ActivityProjectRecordSearch.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityPlanEvaluationSearch.java

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

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityPlanSearch对象", description = "活动计划表查询对象")
 public class ActivityPlanSearch extends QueryInfo{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRegistrationSearch对象", description = "活动报名表查询对象")
 public class ActivityRegistrationSearch extends QueryInfo{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRewardSearch对象", description = "活动奖品表查询对象")
 public class ActivityRewardSearch extends QueryInfo{

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityUserAwardSearch.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityUserRewardSearch.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
-@ApiModel(value = "ActivityUserAwardSearch对象", description = "活动用户获奖表查询对象")
-public class ActivityUserAwardSearch extends QueryInfo{
+@ApiModel(value = "ActivityUserRewardSearch对象", description = "活动用户获奖表查询对象")
+public class ActivityUserRewardSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -0,0 +1,80 @@
+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.InOrOutEnum;
+import com.yonge.toolset.base.page.QueryInfo;
+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;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 16:44:34
+ */
+@ApiModel(value = "PianoRoomChangeRecordSearch对象", description = "琴房时长变更记录表查询对象")
+public class PianoRoomChangeRecordSearch extends QueryInfo{
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("用户id ")
+	private Long userId;
+
+	@ApiModelProperty("操作类型：IN、增加 OUT、减少 ")
+	private InOrOutEnum inOrOut;
+
+	@ApiModelProperty("操作人")
+	private String operaUser;
+
+	@ApiModelProperty(value = "交易开始时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime startTime;
+
+	@ApiModelProperty(value = "交易结束时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private LocalDateTime endTime;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public InOrOutEnum getInOrOut() {
+		return inOrOut;
+	}
+
+	public void setInOrOut(InOrOutEnum inOrOut) {
+		this.inOrOut = inOrOut;
+	}
+
+	public String getOperaUser() {
+		return operaUser;
+	}
+
+	public void setOperaUser(String operaUser) {
+		this.operaUser = operaUser;
+	}
+
+	public LocalDateTime getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(LocalDateTime startTime) {
+		this.startTime = startTime;
+	}
+
+	public LocalDateTime getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(LocalDateTime endTime) {
+		this.endTime = endTime;
+	}
+}

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

@@ -15,9 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 活动项目表
  */
-@TableName("activity_project")
-@ApiModel(value = "ActivityProject对象", description = "活动项目表")
-public class ActivityProject implements Serializable {
+@TableName("activity_evaluation")
+@ApiModel(value = "ActivityEvaluation对象", description = "活动项目表")
+public class ActivityEvaluation implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)

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

@@ -15,9 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 活动项目参与记录表
  */
-@TableName("activity_project_record")
-@ApiModel(value = "ActivityProjectRecord对象", description = "活动项目参与记录表")
-public class ActivityProjectRecord implements Serializable {
+@TableName("activity_evaluation_record")
+@ApiModel(value = "ActivityEvaluationRecord对象", description = "活动项目参与记录表")
+public class ActivityEvaluationRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)

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

@@ -57,9 +57,6 @@ public class ActivityPlan implements Serializable {
     @ApiModelProperty("报名价格 ")
 	@TableField(value = "registration_price_")
     private BigDecimal registrationPrice;
-    @ApiModelProperty("评测难度 BEGINNER 入门级 ADVANCED 进阶级 PERFORMER 大师级 ")
-	@TableField(value = "evaluation_difficulty_")
-    private String evaluationDifficulty;
     @ApiModelProperty("创建状态 0 正式 1 草稿 ")
 	@TableField(value = "draft_flag_")
     private Integer draftFlag;
@@ -171,14 +168,6 @@ public class ActivityPlan implements Serializable {
         this.registrationPrice = registrationPrice;
     }
     
-	public String getEvaluationDifficulty() {
-        return evaluationDifficulty;
-    }
-
-    public void setEvaluationDifficulty(String evaluationDifficulty) {
-        this.evaluationDifficulty = evaluationDifficulty;
-    }
-    
 	public Integer getDraftFlag() {
         return draftFlag;
     }

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

@@ -0,0 +1,93 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+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 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;
+
+/**
+ * 活动计划表
+ */
+@TableName("activity_plan_evaluation")
+@ApiModel(value = "ActivityPlanEvaluation对象", description = "活动计划表")
+public class ActivityPlanEvaluation implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("主键(活动id) ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("评测难度 BEGINNER 入门级 ADVANCED 进阶级 PERFORMER 大师级 ")
+	@TableField(value = "evaluation_difficulty_")
+    private String evaluationDifficulty;
+    @ApiModelProperty("创建时间 ")
+	@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_")
+    private Long createBy;
+    @ApiModelProperty("更新时间 ")
+	@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;
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+
+	public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public String getEvaluationDifficulty() {
+        return evaluationDifficulty;
+    }
+
+    public void setEvaluationDifficulty(String evaluationDifficulty) {
+        this.evaluationDifficulty = evaluationDifficulty;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    
+	public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+    
+	public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+    
+	public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+    
+}

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

@@ -15,9 +15,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 活动用户获奖表
  */
-@TableName("activity_user_award")
-@ApiModel(value = "ActivityUserAward对象", description = "活动用户获奖表")
-public class ActivityUserAward implements Serializable {
+@TableName("activity_user_reward")
+@ApiModel(value = "ActivityUserReward对象", description = "活动用户获奖表")
+public class ActivityUserReward implements Serializable {
 	private static final long serialVersionUID = 1L;
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)

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

@@ -1,54 +0,0 @@
-//package com.yonge.cooleshow.biz.dal.entity;
-//
-//import com.baomidou.mybatisplus.annotation.IdType;
-//import com.baomidou.mybatisplus.annotation.TableField;
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import io.swagger.annotations.ApiModel;
-//import io.swagger.annotations.ApiModelProperty;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * @Author: cy
-// * @Date: 2022/5/26
-// */
-//@ApiModel
-//public class CourseScheduleStudent implements Serializable {
-//    @TableId(value = "id_", type = IdType.AUTO)
-//    @ApiModelProperty(value = "主键")
-//    private Long id;
-//
-//    @TableField("course_id_")
-//    @ApiModelProperty(value = "课程id")
-//    private Long courseId;
-//
-//    @TableField("student_id_")
-//    @ApiModelProperty(value = "学生id")
-//    private Long studentId;
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public Long getCourseId() {
-//        return courseId;
-//    }
-//
-//    public void setCourseId(Long courseId) {
-//        this.courseId = courseId;
-//    }
-//
-//    public Long getStudentId() {
-//        return studentId;
-//    }
-//
-//    public void setStudentId(Long studentId) {
-//        this.studentId = studentId;
-//    }
-//}
-//

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

@@ -4,6 +4,7 @@ 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.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -48,7 +49,18 @@ public class PianoRoomBuyRecord implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-	public Long getId() {
+    public PianoRoomBuyRecord() {
+    }
+
+    public PianoRoomBuyRecord(Long userId, Long settingsId, String orderNo, String subOrderNo, Integer times) {
+        this.userId = userId;
+        this.settingsId = settingsId;
+        this.orderNo = orderNo;
+        this.subOrderNo = subOrderNo;
+        this.times = times;
+    }
+
+    public Long getId() {
         return id;
     }
 
@@ -111,5 +123,5 @@ public class PianoRoomBuyRecord implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    
+
 }

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

@@ -0,0 +1,112 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+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.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+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.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
+
+/**
+ * 琴房时长变更记录表
+ */
+@TableName("piano_room_change_record")
+@ApiModel(value = "PianoRoomChangeRecord对象", description = "琴房时长变更记录表")
+public class PianoRoomChangeRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    @ApiModelProperty("购买记录id ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    @ApiModelProperty("用户id ")
+	@TableField(value = "user_id_")
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
+    @ApiModelProperty("时长（分） ")
+	@TableField(value = "times_")
+    @NotNull(message = "时长不能为空")
+    @Positive(message = "时长必须大于0")
+    private Integer times;
+    @ApiModelProperty("操作类型：IN、增加 OUT、减少 ")
+	@TableField(value = "in_or_out_")
+    @NotNull(message = "操作类型不能为空")
+    private InOrOutEnum inOrOut;
+    @ApiModelProperty("原因 ")
+	@TableField(value = "reason_")
+    @NotBlank(message = "原因不能为空")
+    private String reason;
+    @ApiModelProperty("创建时间 ")
+	@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_")
+    private Long createBy;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+	public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    
+	public Integer getTimes() {
+        return times;
+    }
+
+    public void setTimes(Integer times) {
+        this.times = times;
+    }
+    
+	public InOrOutEnum getInOrOut() {
+        return inOrOut;
+    }
+
+    public void setInOrOut(InOrOutEnum inOrOut) {
+        this.inOrOut = inOrOut;
+    }
+    
+	public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+    
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    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/service/ActivityEvaluationRecordService.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+
+/**
+ * 活动项目参与记录表 服务类
+ * @author liweifan
+ * @date 2022-08-04
+ */
+public interface ActivityEvaluationRecordService extends IService<ActivityEvaluationRecord>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+	ActivityEvaluationRecordVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+    IPage<ActivityEvaluationRecordVo> selectPage(IPage<ActivityEvaluationRecordVo> page, ActivityEvaluationRecordSearch query);
+}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+
+/**
+ * 活动项目表 服务类
+ * @author liweifan
+ * @date 2022-08-04
+ */
+public interface ActivityEvaluationService extends IService<ActivityEvaluation>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+	ActivityEvaluationVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+    IPage<ActivityEvaluationVo> selectPage(IPage<ActivityEvaluationVo> page, ActivityEvaluationSearch query);
+}

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

@@ -9,21 +9,21 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
 /**
  * 活动计划表 服务类
  * @author liweifan
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public interface ActivityPlanService extends IService<ActivityPlan>  {
 
 	/**
      * 查询详情
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
 	ActivityPlanVo detail(Long id);
 
     /**
      * 分页查询
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
     IPage<ActivityPlanVo> selectPage(IPage<ActivityPlanVo> page, ActivityPlanSearch query);
 }

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

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectRecordSearch;
-import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
-
-/**
- * 活动项目参与记录表 服务类
- * @author liweifan
- * @date 2022-08-03
- */
-public interface ActivityProjectRecordService extends IService<ActivityProjectRecord>  {
-
-	/**
-     * 查询详情
-     * @author liweifan
- 	 * @date 2022-08-03
-     */
-	ActivityProjectRecordVo detail(Long id);
-
-    /**
-     * 分页查询
-     * @author liweifan
- 	 * @date 2022-08-03
-     */
-    IPage<ActivityProjectRecordVo> selectPage(IPage<ActivityProjectRecordVo> page, ActivityProjectRecordSearch query);
-}

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

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectSearch;
-import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
-
-/**
- * 活动项目表 服务类
- * @author liweifan
- * @date 2022-08-03
- */
-public interface ActivityProjectService extends IService<ActivityProject>  {
-
-	/**
-     * 查询详情
-     * @author liweifan
- 	 * @date 2022-08-03
-     */
-	ActivityProjectVo detail(Long id);
-
-    /**
-     * 分页查询
-     * @author liweifan
- 	 * @date 2022-08-03
-     */
-    IPage<ActivityProjectVo> selectPage(IPage<ActivityProjectVo> page, ActivityProjectSearch query);
-}

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

@@ -9,21 +9,21 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityRegistration;
 /**
  * 活动报名表 服务类
  * @author liweifan
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public interface ActivityRegistrationService extends IService<ActivityRegistration>  {
 
 	/**
      * 查询详情
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
 	ActivityRegistrationVo detail(Long id);
 
     /**
      * 分页查询
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
     IPage<ActivityRegistrationVo> selectPage(IPage<ActivityRegistrationVo> page, ActivityRegistrationSearch query);
 }

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

@@ -9,21 +9,21 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
 /**
  * 活动奖品表 服务类
  * @author liweifan
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public interface ActivityRewardService extends IService<ActivityReward>  {
 
 	/**
      * 查询详情
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
 	ActivityRewardVo detail(Long id);
 
     /**
      * 分页查询
      * @author liweifan
- 	 * @date 2022-08-03
+ 	 * @date 2022-08-04
      */
     IPage<ActivityRewardVo> selectPage(IPage<ActivityRewardVo> page, ActivityRewardSearch query);
 }

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

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserAwardSearch;
-import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
-
-/**
- * 活动用户获奖表 服务类
- * @author liweifan
- * @date 2022-08-03
- */
-public interface ActivityUserAwardService extends IService<ActivityUserAward>  {
-
-	/**
-     * 查询详情
-     * @author liweifan
- 	 * @date 2022-08-03
-     */
-	ActivityUserAwardVo detail(Long id);
-
-    /**
-     * 分页查询
-     * @author liweifan
- 	 * @date 2022-08-03
-     */
-    IPage<ActivityUserAwardVo> selectPage(IPage<ActivityUserAwardVo> page, ActivityUserAwardSearch query);
-}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+
+/**
+ * 活动用户获奖表 服务类
+ * @author liweifan
+ * @date 2022-08-04
+ */
+public interface ActivityUserRewardService extends IService<ActivityUserReward>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+	ActivityUserRewardVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-04
+     */
+    IPage<ActivityUserRewardVo> selectPage(IPage<ActivityUserRewardVo> page, ActivityUserRewardSearch query);
+}

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

@@ -0,0 +1,31 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomChangeRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+
+/**
+ * 琴房时长变更记录表 服务类
+ * @author liweifan
+ * @date 2022-08-03
+ */
+public interface PianoRoomChangeRecordService extends IService<PianoRoomChangeRecord>  {
+
+	/**
+     * 查询详情
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+	PianoRoomChangeRecordVo detail(Long id);
+
+    /**
+     * 分页查询
+     * @author liweifan
+ 	 * @date 2022-08-03
+     */
+    IPage<PianoRoomChangeRecordVo> selectPage(IPage<PianoRoomChangeRecordVo> page, PianoRoomChangeRecordSearch query);
+
+	boolean add(PianoRoomChangeRecord pianoRoomChangeRecord);
+}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationRecordDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationRecordService;
+
+
+@Service
+public class ActivityEvaluationRecordServiceImpl extends ServiceImpl<ActivityEvaluationRecordDao, ActivityEvaluationRecord> implements ActivityEvaluationRecordService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityEvaluationRecordServiceImpl.class);
+
+	@Override
+    public ActivityEvaluationRecordVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityEvaluationRecordVo> selectPage(IPage<ActivityEvaluationRecordVo> page, ActivityEvaluationRecordSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
+
+
+@Service
+public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluationDao, ActivityEvaluation> implements ActivityEvaluationService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityEvaluationServiceImpl.class);
+
+	@Override
+    public ActivityEvaluationVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityEvaluationVo> selectPage(IPage<ActivityEvaluationVo> page, ActivityEvaluationSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

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

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
-import com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectRecordSearch;
-import com.yonge.cooleshow.biz.dal.dao.ActivityProjectRecordDao;
-import com.yonge.cooleshow.biz.dal.service.ActivityProjectRecordService;
-
-
-@Service
-public class ActivityProjectRecordServiceImpl extends ServiceImpl<ActivityProjectRecordDao, ActivityProjectRecord> implements ActivityProjectRecordService {
-    private final static Logger log = LoggerFactory.getLogger(ActivityProjectRecordServiceImpl.class);
-
-	@Override
-    public ActivityProjectRecordVo detail(Long id) {
-        return baseMapper.detail(id);
-    }
-    
-    @Override
-    public IPage<ActivityProjectRecordVo> selectPage(IPage<ActivityProjectRecordVo> page, ActivityProjectRecordSearch query){
-        return page.setRecords(baseMapper.selectPage(page, query));
-    }
-	
-}

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

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
-import com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityProjectSearch;
-import com.yonge.cooleshow.biz.dal.dao.ActivityProjectDao;
-import com.yonge.cooleshow.biz.dal.service.ActivityProjectService;
-
-
-@Service
-public class ActivityProjectServiceImpl extends ServiceImpl<ActivityProjectDao, ActivityProject> implements ActivityProjectService {
-    private final static Logger log = LoggerFactory.getLogger(ActivityProjectServiceImpl.class);
-
-	@Override
-    public ActivityProjectVo detail(Long id) {
-        return baseMapper.detail(id);
-    }
-    
-    @Override
-    public IPage<ActivityProjectVo> selectPage(IPage<ActivityProjectVo> page, ActivityProjectSearch query){
-        return page.setRecords(baseMapper.selectPage(page, query));
-    }
-	
-}

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

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
-import com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo;
-import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserAwardSearch;
-import com.yonge.cooleshow.biz.dal.dao.ActivityUserAwardDao;
-import com.yonge.cooleshow.biz.dal.service.ActivityUserAwardService;
-
-
-@Service
-public class ActivityUserAwardServiceImpl extends ServiceImpl<ActivityUserAwardDao, ActivityUserAward> implements ActivityUserAwardService {
-    private final static Logger log = LoggerFactory.getLogger(ActivityUserAwardServiceImpl.class);
-
-	@Override
-    public ActivityUserAwardVo detail(Long id) {
-        return baseMapper.detail(id);
-    }
-    
-    @Override
-    public IPage<ActivityUserAwardVo> selectPage(IPage<ActivityUserAwardVo> page, ActivityUserAwardSearch query){
-        return page.setRecords(baseMapper.selectPage(page, query));
-    }
-	
-}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
+import com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao;
+import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+
+
+@Service
+public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewardDao, ActivityUserReward> implements ActivityUserRewardService {
+    private final static Logger log = LoggerFactory.getLogger(ActivityUserRewardServiceImpl.class);
+
+	@Override
+    public ActivityUserRewardVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+    
+    @Override
+    public IPage<ActivityUserRewardVo> selectPage(IPage<ActivityUserRewardVo> page, ActivityUserRewardSearch query){
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+}

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

@@ -81,13 +81,8 @@ public class PianoRoomBuyRecordServiceImpl extends ServiceImpl<PianoRoomBuyRecor
         TeacherVo teacherVo = teacherService.detail(orderDetailVo.getUserId());
 
         //保存琴房购买记录
-        PianoRoomBuyRecord record = new PianoRoomBuyRecord();
-        record.setUserId(teacherVo.getUserId());
-        record.setSettingsId(detail.getId());
-        record.setOrderNo(orderDetailVo.getOrderNo());
-        record.setSubOrderNo(orderDetailVo.getSubOrderNo());
-        record.setTimes(detail.getTimes());
-        save(record);
+        save(new PianoRoomBuyRecord(teacherVo.getUserId(), detail.getId(), orderDetailVo.getOrderNo(),
+                orderDetailVo.getSubOrderNo(), detail.getTimes()));
 
         //入琴房账户
         DistributedLock.of(redissonClient)

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

@@ -0,0 +1,79 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomTime;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import com.yonge.cooleshow.biz.dal.service.PianoRoomTimeService;
+import com.yonge.cooleshow.common.enums.CacheNameEnum;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.payment.util.DistributedLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo;
+import com.yonge.cooleshow.biz.dal.dto.search.PianoRoomChangeRecordSearch;
+import com.yonge.cooleshow.biz.dal.dao.PianoRoomChangeRecordDao;
+import com.yonge.cooleshow.biz.dal.service.PianoRoomChangeRecordService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+
+@Service
+public class PianoRoomChangeRecordServiceImpl extends ServiceImpl<PianoRoomChangeRecordDao, PianoRoomChangeRecord> implements PianoRoomChangeRecordService {
+    private final static Logger log = LoggerFactory.getLogger(PianoRoomChangeRecordServiceImpl.class);
+    @Autowired
+    private RedissonClient redissonClient;
+    @Autowired
+    private PianoRoomTimeService pianoRoomTimeService;
+
+    @Override
+    public PianoRoomChangeRecordVo detail(Long id) {
+        return baseMapper.detail(id);
+    }
+
+    @Override
+    public IPage<PianoRoomChangeRecordVo> selectPage(IPage<PianoRoomChangeRecordVo> page, PianoRoomChangeRecordSearch query) {
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean add(PianoRoomChangeRecord pianoRoomChangeRecord) {
+        //保存记录
+        save(pianoRoomChangeRecord);
+        //入琴房账户
+        DistributedLock.of(redissonClient)
+                .runIfLockToFunction(CacheNameEnum.LOCK_CHANGE_PIANO_ROOM_ACCOUNT.getRedisKey(pianoRoomChangeRecord.getUserId())
+                        , (o) -> {
+                            PianoRoomTime pianoRoomTime = pianoRoomTimeService.getOne(Wrappers.<PianoRoomTime>lambdaQuery()
+                                    .eq(PianoRoomTime::getTeacherId, pianoRoomChangeRecord.getUserId()));
+
+                            if (null == pianoRoomTime) {
+                                pianoRoomTime = new PianoRoomTime();
+                                pianoRoomTime.setTeacherId(pianoRoomChangeRecord.getUserId());
+                                pianoRoomTimeService.save(pianoRoomTime);
+                            }
+
+                            if (InOrOutEnum.IN.equals(pianoRoomChangeRecord.getInOrOut())) {
+                                pianoRoomTime.setRemainTime(pianoRoomTime.getRemainTime() + pianoRoomChangeRecord.getTimes());
+                            } else {
+                                pianoRoomTime.setRemainTime(pianoRoomTime.getRemainTime() - pianoRoomChangeRecord.getTimes());
+                            }
+
+                            if (pianoRoomTime.getRemainTime() < 0) {
+                                throw new BizException("时长余额不足");
+                            }
+                            pianoRoomTime.setUpdateTime(new Date());
+                            pianoRoomTimeService.updateById(pianoRoomTime);
+                            return null;
+                        }, null, 10l);
+        return true;
+    }
+
+}

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@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

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

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityPlanEvaluationVo对象", description = "活动计划表查询视图对象")
+public class ActivityPlanEvaluationVo extends ActivityPlanEvaluation{
+	private static final long serialVersionUID = 1L;
+}

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityPlanVo对象", description = "活动计划表查询视图对象")
 public class ActivityPlanVo extends ActivityPlan{

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.vo;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
- */
-@ApiModel(value = "ActivityProjectRecordVo对象", description = "活动项目参与记录表查询视图对象")
-public class ActivityProjectRecordVo extends ActivityProjectRecord{
-	private static final long serialVersionUID = 1L;
-}

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.vo;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityProject;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
- */
-@ApiModel(value = "ActivityProjectVo对象", description = "活动项目表查询视图对象")
-public class ActivityProjectVo extends ActivityProject{
-	private static final long serialVersionUID = 1L;
-}

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRegistrationVo对象", description = "活动报名表查询视图对象")
 public class ActivityRegistrationVo extends ActivityRegistration{

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
 
 /**
  * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
+ * @Data: 2022-08-04 10:19:49
  */
 @ApiModel(value = "ActivityRewardVo对象", description = "活动奖品表查询视图对象")
 public class ActivityRewardVo extends ActivityReward{

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

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow.biz.dal.vo;
-
-import com.yonge.cooleshow.biz.dal.entity.ActivityUserAward;
-import io.swagger.annotations.ApiModel;
-
-/**
- * @Author: liweifan
- * @Data: 2022-08-03 10:36:44
- */
-@ApiModel(value = "ActivityUserAwardVo对象", description = "活动用户获奖表查询视图对象")
-public class ActivityUserAwardVo extends ActivityUserAward{
-	private static final long serialVersionUID = 1L;
-}

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

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-04 10:19:49
+ */
+@ApiModel(value = "ActivityUserRewardVo对象", description = "活动用户获奖表查询视图对象")
+public class ActivityUserRewardVo extends ActivityUserReward{
+	private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,25 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022-08-03 16:44:34
+ */
+@ApiModel(value = "PianoRoomChangeRecordVo对象", description = "琴房时长变更记录表查询视图对象")
+public class PianoRoomChangeRecordVo extends PianoRoomChangeRecord{
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("操作人")
+	private String operaUser;
+
+	public String getOperaUser() {
+		return operaUser;
+	}
+
+	public void setOperaUser(String operaUser) {
+		this.operaUser = operaUser;
+	}
+}

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

@@ -1,7 +1,7 @@
 <?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.ActivityProjectDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityProject">
+<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" />
@@ -20,16 +20,16 @@
         , t.create_by_ as createBy
         </sql> 
     
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
         SELECT
             <include refid="baseColumns"/>
-        FROM activity_project t
+        FROM activity_evaluation t
         where t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
 		SELECT         
         	<include refid="baseColumns" />
-		FROM activity_project t
+		FROM activity_evaluation t
 	</select>
 </mapper>

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

@@ -1,7 +1,7 @@
 <?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.ActivityProjectRecordDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityProjectRecord">
+<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" />
@@ -20,16 +20,16 @@
         , t.create_time_ as createTime
         </sql> 
     
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo">
         SELECT
             <include refid="baseColumns"/>
-        FROM activity_project_record t
+        FROM activity_evaluation_record t
         where t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityProjectRecordVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo">
 		SELECT         
         	<include refid="baseColumns" />
-		FROM activity_project_record t
+		FROM activity_evaluation_record t
 	</select>
 </mapper>

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

@@ -0,0 +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.ActivityPlanEvaluationDao">
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation">
+            <result column="id_" property="id" />
+	        <result column="evaluation_difficulty_" property="evaluationDifficulty" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="create_by_" property="createBy" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="update_by_" property="updateBy" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ as id
+        , t.evaluation_difficulty_ as evaluationDifficulty
+        , t.create_time_ as createTime
+        , t.create_by_ as createBy
+        , t.update_time_ as updateTime
+        , t.update_by_ as updateBy
+        </sql> 
+    
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo">
+        SELECT
+            <include refid="baseColumns"/>
+        FROM activity_plan_evaluation t
+        where t.id_ = #{id}
+    </select>
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanEvaluationVo">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM activity_plan_evaluation t
+	</select>
+</mapper>

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

@@ -13,7 +13,6 @@
 	        <result column="activity_end_" property="activityEnd" />
 	        <result column="registration_method_" property="registrationMethod" />
 	        <result column="registration_price_" property="registrationPrice" />
-	        <result column="evaluation_difficulty_" property="evaluationDifficulty" />
 	        <result column="draft_flag_" property="draftFlag" />
 	        <result column="activity_state_" property="activityState" />
 	        <result column="create_time_" property="createTime" />
@@ -35,7 +34,6 @@
         , t.activity_end_ as activityEnd
         , t.registration_method_ as registrationMethod
         , t.registration_price_ as registrationPrice
-        , t.evaluation_difficulty_ as evaluationDifficulty
         , t.draft_flag_ as draftFlag
         , t.activity_state_ as activityState
         , t.create_time_ as createTime

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

@@ -1,7 +1,7 @@
 <?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.ActivityUserAwardDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityUserAward">
+<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" />
@@ -24,16 +24,16 @@
         , t.update_time_ as updateTime
         </sql> 
     
-    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo">
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo">
         SELECT
             <include refid="baseColumns"/>
-        FROM activity_user_award t
+        FROM activity_user_reward t
         where t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserAwardVo">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo">
 		SELECT         
         	<include refid="baseColumns" />
-		FROM activity_user_award t
+		FROM activity_user_reward t
 	</select>
 </mapper>

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

@@ -0,0 +1,58 @@
+<?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.PianoRoomChangeRecordDao">
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.PianoRoomChangeRecord">
+        <result column="id_" property="id" />
+        <result column="user_id_" property="userId" />
+        <result column="times_" property="times" />
+        <result column="in_or_out_" property="inOrOut" />
+        <result column="reason_" property="reason" />
+        <result column="create_time_" property="createTime" />
+        <result column="create_by_" property="createBy" />
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+        t.id_ as id
+        , t.user_id_ as userId
+        , t.times_ as times
+        , t.in_or_out_ as inOrOut
+        , t.reason_ as reason
+        , t.create_time_ as createTime
+        , t.create_by_ as createBy
+    </sql>
+
+    <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo">
+        SELECT
+            <include refid="baseColumns" />,
+            ifnull(u.real_name_,u.username_) as operaUser
+        FROM piano_room_change_record t
+        left join sys_user u on t.create_by_ = u.id_
+        where t.id_ = #{id}
+    </select>
+
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.PianoRoomChangeRecordVo">
+        SELECT
+            <include refid="baseColumns" />,
+            ifnull(u.real_name_,u.username_) as operaUser
+        FROM piano_room_change_record t
+        left join sys_user u on t.create_by_ = u.id_
+        <where>
+            <if test="param.userId != null">
+                and t.user_id_ = #{param.userId}
+            </if>
+            <if test="param.inOrOut != null">
+                and t.in_or_out_ = #{param.inOrOut}
+            </if>
+            <if test="param.operaUser != null and param.operaUser != ''">
+                and u.username_ LIKE CONCAT('%', #{param.operaUser}, '%')
+            </if>
+            <if test="param.startTime !=null">
+                <![CDATA[AND t.created_time_ >= #{param.startTime} ]]>
+            </if>
+            <if test="param.endTime !=null">
+                <![CDATA[AND t.created_time_ <= #{param.endTime} ]]>
+            </if>
+        </where>
+    </select>
+</mapper>