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

@@ -1,5 +1,7 @@
 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.biz.dal.dto.ActivityEvaluationDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
@@ -14,9 +16,11 @@ 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.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 
 import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
@@ -32,7 +36,8 @@ public class ActivityEvaluationController extends BaseController {
 
     @Autowired
     private ActivityEvaluationService activityEvaluationService;
-    
+	@Resource
+	private SysUserFeignService sysUserFeignService;
     /**
      * 查询分页
      */
@@ -59,7 +64,11 @@ public class ActivityEvaluationController extends BaseController {
 	@ApiOperation(value = "批量增加曲目")
 	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/addBatch')")
 	public HttpResponseResult addBatch(@Valid @RequestBody ActivityEvaluationDto param) {
-    	return status(activityEvaluationService.addBatch(param));
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+    	return status(activityEvaluationService.addBatch(param,user));
 	}
 
  	/**

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

@@ -1,5 +1,7 @@
 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.biz.dal.dto.ActivityRewardDto;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -10,9 +12,11 @@ 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.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 
 import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
@@ -27,6 +31,8 @@ public class ActivityRewardController extends BaseController {
 
     @Autowired
     private ActivityRewardService activityRewardService;
+	@Resource
+	private SysUserFeignService sysUserFeignService;
 
 	/**
      * 通过奖品id查询单条
@@ -66,6 +72,10 @@ public class ActivityRewardController extends BaseController {
     @ApiOperation(value = "新增或修改", notes = "传入activityReward")
 	@PreAuthorize("@pcs.hasPermissions('activityReward/submit')")
 	public HttpResponseResult submit(@Valid @RequestBody ActivityRewardDto activityReward) {
-        return status(activityRewardService.submit(activityReward));
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+        return status(activityRewardService.submit(activityReward, user));
     }
 }

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

@@ -40,7 +40,7 @@ public interface ActivityEvaluationDao extends BaseMapper<ActivityEvaluation> {
      * @param musicSheetIds
      * @return
      */
-    Integer addBatch(@Param("activityId") Long activityId, @Param("musicSheetIds") List<Long> musicSheetIds);
+    Integer addBatch(@Param("activityId") Long activityId,@Param("userId") Long userId , @Param("musicSheetIds") List<Long> musicSheetIds);
 
 	/**
 	 * 获取活动曲目信息

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

@@ -14,7 +14,7 @@ public class VideoLessonGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "是否上架 （0:否  1：是）")
     private Integer shelvesFlag;
 
-    @ApiModelProperty(value = "审核状态(DOING:审核中 PASS:已上架 UNPASS:审核失败 UNSHELVES: 下架)")
+    @ApiModelProperty(value = "审核状态(DOING:审核中 PASS:已上架 UNPASS:审核失败 OUT_SALE: 下架)")
     private String auditStatus;
 
     @ApiModelProperty(value = "视频课组id")

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

@@ -2,6 +2,7 @@ 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.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.ActivityEvaluationDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
@@ -40,7 +41,7 @@ public interface ActivityEvaluationService extends IService<ActivityEvaluation>
 	 * @param param
 	 * @return
 	 */
-    Boolean addBatch(ActivityEvaluationDto param);
+    Boolean addBatch(ActivityEvaluationDto param, SysUser user);
 
 	/**
 	 * 获取活动曲目细腻

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

@@ -2,6 +2,7 @@ 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.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.ActivityRewardDto;
 import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
@@ -36,7 +37,7 @@ public interface ActivityRewardService extends IService<ActivityReward>  {
      */
     IPage<ActivityRewardVo> selectPage(IPage<ActivityRewardVo> page, ActivityRewardSearch query);
 
-	Boolean submit(ActivityRewardDto activityReward);
+	Boolean submit(ActivityRewardDto activityReward, SysUser user);
 
 	/**
 	 * 获取活动所有奖品

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

@@ -3,13 +3,17 @@ 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.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.ActivityEvaluationDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 import com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.toolset.base.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +23,7 @@ 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;
 
+import java.util.Date;
 import java.util.List;
 
 import java.util.Map;
@@ -28,6 +33,8 @@ import java.util.stream.Collectors;
 @Service
 public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluationDao, ActivityEvaluation> implements ActivityEvaluationService {
     private final static Logger log = LoggerFactory.getLogger(ActivityEvaluationServiceImpl.class);
+    @Autowired
+    private ActivityPlanService activityPlanService;
 
     @Override
     public ActivityEvaluationVo detail(Long id) {
@@ -45,7 +52,7 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
     }
 
     @Override
-    public Boolean addBatch(ActivityEvaluationDto param) {
+    public Boolean addBatch(ActivityEvaluationDto param, SysUser user) {
         List<Long> musicSheetIds = WrapperUtil.toLongList(param.getMusicSheetIds());
 
         List<ActivityEvaluation> activityEvaluations = baseMapper.selectList(Wrappers.<ActivityEvaluation>lambdaQuery()
@@ -58,8 +65,13 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
         if ((oldMusicSheetIds.size() + musicSheetIds.size()) > 10) {
             throw new BizException("添加的曲目不能多余10首");
         }
-        if(CollectionUtils.isNotEmpty(musicSheetIds)){
-            baseMapper.addBatch(param.getActivityId(),musicSheetIds);
+        if (CollectionUtils.isNotEmpty(musicSheetIds)) {
+            baseMapper.addBatch(param.getActivityId(), user.getId(), musicSheetIds);
+            //更新修改人和修改时间
+            activityPlanService.update(Wrappers.<ActivityPlan>lambdaUpdate()
+                    .set(ActivityPlan::getUpdateBy, user.getId())
+                    .eq(ActivityPlan::getId,param.getActivityId())
+            );
         }
         return true;
     }

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

@@ -3,6 +3,7 @@ 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.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.ActivityPlanDao;
 import com.yonge.cooleshow.biz.dal.dto.ActivityRewardDto;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
@@ -18,6 +19,7 @@ import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 
@@ -45,18 +47,21 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean submit(ActivityRewardDto activityReward) {
+    public Boolean submit(ActivityRewardDto activityReward, SysUser user) {
+        ActivityPlan activityPlan = new ActivityPlan();
+        activityPlan.setId(activityReward.getActivityId());
         //更改活动状态
         if(activityReward.getDraftFlag() == 0){
-            ActivityPlan activityPlan = new ActivityPlan();
-            activityPlan.setId(activityReward.getActivityId());
             activityPlan.setDraftFlag(activityReward.getDraftFlag());
-            activityPlanDao.updateById(activityPlan);
         }
+        activityPlan.setUpdateBy(user.getId());
+        activityPlanDao.updateById(activityPlan);
 
         if(null == activityReward.getId()){
+            activityReward.setCreateBy(user.getId());
             return createActivityReward(activityReward);
         }else{
+            activityReward.setUpdateBy(user.getId());
             return updateActivityReward(activityReward);
         }
     }

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

@@ -29,6 +29,7 @@ import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.string.MessageFormatter;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
+import io.netty.util.internal.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,6 +82,14 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
      */
     @Override
     public IPage<VideoLessonGroupVo> selectPage(IPage<VideoLessonGroupVo> page, VideoLessonGroupSearch query) {
+        if(!StringUtil.isNullOrEmpty(query.getAuditStatus())){
+            if(query.getAuditStatus().equals("OUT_SALE")){
+                query.setAuditStatus(null);
+                query.setShelvesFlag(0);
+            }else{
+                query.setShelvesFlag(1);
+            }
+        }
         return page.setRecords(baseMapper.selectPage(page, query));
     }
 

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

@@ -54,9 +54,9 @@
     </select>
 
     <insert id="addBatch">
-        insert into activity_evaluation (activity_id_, music_sheet_id_) values
+        insert into activity_evaluation (activity_id_,create_by_, music_sheet_id_) values
         <foreach collection="musicSheetIds" item="item" separator="," index="index">
-            (#{activityId,jdbcType=BIGINT},#{item,jdbcType=BIGINT})
+            (#{activityId,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{item,jdbcType=BIGINT})
         </foreach>
     </insert>
 

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

@@ -52,7 +52,7 @@
             left join (
                 select
                     ar.activity_id_,aer.user_id_,
-                    group_concat(ms.music_sheet_name_) as music_sheet_name_,
+                    group_concat(DISTINCT ms.music_sheet_name_) as music_sheet_name_,
                     count(aer.id_) as num_,
                     max(aer.score_) as max_score_
                 from activity_registration ar

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java

@@ -73,15 +73,6 @@ public class VideoLessonGroupController extends BaseController {
         if (query.getMyself() != null && !query.getMyself()) {
             query.setAuditStatus(AuthStatusEnum.PASS.getCode());
         }
-
-        if(!StringUtil.isNullOrEmpty(query.getAuditStatus())){
-            if(query.getAuditStatus().equals("UNSHELVES")){
-                query.setAuditStatus(null);
-                query.setShelvesFlag(0);
-            }else{
-                query.setShelvesFlag(1);
-            }
-        }
         IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }