Merge branch 'feature/1128_tenant' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -417,6 +417,7 @@ public class MusicSheetController extends BaseController {
             throw new BizException("用户信息获取失败");
         }
         queryInfo.setUserId(sysUser.getId());
+        queryInfo.setProviderType(SourceTypeEnum.PLATFORM);
         return succeed(musicSheetService.search(queryInfo));
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -17,6 +17,7 @@ import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
 import com.yonge.cooleshow.biz.dal.service.TenantGroupService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.wrapper.OssFileWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
@@ -263,4 +264,13 @@ public class StudentController extends BaseController {
         }
         return tenantInfo;
     }
+    @ApiOperation(value = "查询学员基本信息")
+    @GetMapping("/queryUserInfo")
+    public HttpResponseResult<StudentHomeVo> queryUserInfo(Long userId) throws Exception {
+        SysUser user = sysUserFeignService.queryUserById(userId);
+        if (user == null || null == user.getId()) {
+            return failed(500, "参数错误");
+        }
+        return succeed(studentService.queryUserInfo(user));
+    }
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/SysMusicCompareRecordController.java

@@ -10,10 +10,8 @@ import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "学生端训练记录")
 @RequestMapping("${app-config.url.tenant:}/studentMusicCompareRecord")
@@ -73,5 +71,15 @@ public class SysMusicCompareRecordController extends BaseController {
         queryInfo.setUserId(sysUser.getId());
         return succeed(sysMusicCompareRecordService.studentTrainData(queryInfo));
     }
+    @ApiOperation("学员训练数据统计每周")
+    @GetMapping("studentTrainDataByWeek")
+    public HttpResponseResult studentTrainDataByWeek(SysMusicCompareRecordQueryInfo.TeacherCompareRecordQueryInfo queryInfo){
+
+        if (StringUtils.isEmpty(queryInfo.getStartTime())) {
+            return failed("时间不能为空");
+        }
+        queryInfo.setClientId("student");
+        return succeed(sysMusicCompareRecordService.studentTrainData(queryInfo));
+    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/music/MusicCompareWrapper.java

@@ -2,10 +2,7 @@ package com.yonge.cooleshow.biz.dal.wrapper.music;
 
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.FeatureType;
-import com.yonge.cooleshow.biz.dal.enums.HeardLevelEnum;
-import com.yonge.cooleshow.biz.dal.enums.MK;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.enums.music.MusicCompareType;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
@@ -380,6 +377,8 @@ public class MusicCompareWrapper {
         @ApiModelProperty("名称 ")
         private String name;
 
+        @ApiModelProperty(value = "提供方 TENANT 机构 PLATFORM 平台")
+        private SourceTypeEnum providerType;
 
         @ApiModelProperty("类型 MUSIC 曲目 ALBUM专辑")
         private String type;

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

@@ -834,6 +834,9 @@
                     </foreach>
                     and tam.del_flag_=0
                 </if>
+                <if test="param.providerType != null">
+                    and t.provider_type_ = #{param.providerType}
+                </if>
             </where>
         order by t.top_flag_ desc, t.sort_number_ desc, t.favorite_count_ desc