Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -133,7 +133,7 @@ public class ActivityEvaluationController extends BaseController {
 		if(null == query.getActivityId()){
 			return failed("活动id不能为空");
 		}
-		query.setAuditStatus(AuthStatusEnum.PASS);
+		query.setAuditStatus(null);
 		query.setState(YesOrNoEnum.YES);
 		query.setAuditVersion(YesOrNoEnum.NO);
 		IPage<MusicSheetVo> musicSheetVoIPage = activityEvaluationService.musicPage(PageUtil.getPage(query), query);

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

@@ -159,7 +159,7 @@ public class MusicSheetController extends BaseController {
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
         query.setAuditVersion(appAuditVersion);
-        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setAuditStatus(null);
         query.setStudentId(sysUser.getId());
 
         // query.setSubjectIds(student.getSubjectId());
@@ -223,7 +223,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         // search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         search.setUserType(ClientEnum.STUDENT);
         search.setPurchaseType(Optional.ofNullable(search.getPurchaseType()).orElse(PurchaseRecordTypeEnum.MUSIC));
         search.setCourseGift(gift);
@@ -246,7 +246,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search, ClientEnum.STUDENT);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -265,7 +265,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -285,7 +285,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(userId);
         search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         search.setRows(3);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(search),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
@@ -355,7 +355,7 @@ public class MusicSheetController extends BaseController {
 
         //  只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
-        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setAuditStatus(null);
         query.setStudentId(sysUser.getId());
         query.setMyself(false);
         query.setRows(20);

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

@@ -187,8 +187,8 @@ public class MusicSheetController extends BaseController {
     public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(@RequestBody  StudentMusicSheetSearch search) {
         SysUser sysUser = sysUserService.getUser();
         search.setStudentId(sysUser.getId());
-        // search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+//        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(null);
         search.setUserType(ClientEnum.TEACHER);
         search.setPurchaseType(PurchaseRecordTypeEnum.MUSIC);
         search.setCourseGift(Optional.ofNullable(search.getCourseGift()).orElse(EStatus.DISABLE.getValue()));
@@ -207,7 +207,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search, ClientEnum.TEACHER);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -253,7 +253,7 @@ public class MusicSheetController extends BaseController {
 
         //  只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
-        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setAuditStatus(null);
         query.setStudentId(sysUser.getId());
         query.setMyself(false);
         query.setRows(20);
@@ -296,7 +296,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(userId);
         search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         search.setRows(3);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(search),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));

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

@@ -89,7 +89,7 @@ public class MusicSheetController extends BaseController {
 
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         search.setUserType(ClientEnum.valueOf(clientType));
         search.setPurchaseType(Optional.ofNullable(search.getPurchaseType()).orElse(PurchaseRecordTypeEnum.MUSIC));
         search.setCourseGift(Optional.ofNullable(search.getCourseGift()).orElse(EStatus.DISABLE.getValue()));
@@ -119,7 +119,7 @@ public class MusicSheetController extends BaseController {
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
-        search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setAuditStatus(null);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search, ClientEnum.valueOf(clientType));
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/open/OpenMusicSheetController.java

@@ -94,7 +94,7 @@ public class OpenMusicSheetController extends BaseController {
 
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
-        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setAuditStatus(null);
         if (sysUser != null) {
             query.setStudentId(sysUser.getId());
         }
@@ -117,7 +117,7 @@ public class OpenMusicSheetController extends BaseController {
         // 学生 只能看通过审核 并且 启用的 曲目
         query.setState(YesOrNoEnum.YES);
         query.setAuditVersion(YesOrNoEnum.NO);
-        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setAuditStatus(null);
         if (sysUser != null) {
             query.setStudentId(sysUser.getId());
         }

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

@@ -366,7 +366,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         MusicSheetSearch query = new MusicSheetSearch();
         // 设置只查老师用户
         query.setCreateBy(sysUser.getId());
-        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setAuditStatus(null);
         query.setState(YesOrNoEnum.YES);
         query.setDelFlag(false);
         query.setSourceType(SourceTypeEnum.TEACHER);
@@ -1438,7 +1438,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         MusicSheetSearch musicSheetSearch = new MusicSheetSearch();
         musicSheetSearch.setCreateBy(teacherVo.getUserId());
         musicSheetSearch.setState(YesOrNoEnum.YES);
-        musicSheetSearch.setAuditStatus(AuthStatusEnum.PASS);
+        musicSheetSearch.setAuditStatus(null);
         musicSheetSearch.setPage(1);
         musicSheetSearch.setRows(5);
         List<MusicSheetVo> musicSheetVos = baseMapper.selectPage(PageUtil.getPage(musicSheetSearch), musicSheetSearch);

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

@@ -129,6 +129,9 @@
                 where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
+        <if test="param.auditStatus != null">
+            left join music_sheet_auth_record msar ON msar.music_sheet_id_ = t.id_
+        </if>
         <where>
             su.del_flag_ = 0
             and not exists(

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

@@ -21,9 +21,12 @@
         max(mspr.id_) as id_
         from sys_music_compare_record mspr
         left join music_sheet ms on mspr.music_sheet_id_ = ms.id_
+        <if test="param.auditStatus != null">
+            left join music_sheet_auth_record msar ON msar.music_sheet_id_ = ms.id_
+        </if>
         <where>
-            <if test="param.auditStatus !=null">
-                and ms.audit_status_ = #{param.auditStatus}
+            <if test="param.auditStatus != null">
+                and msar.audit_state_ = #{param.auditStatus}
             </if>
             <if test="param.state != null">
                 and ms.state_ = #{param.state}