酷乐秀曲目来源改为内容平台

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

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
 import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.biz.dal.vo.activity.ActivityTeacherWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.MusicSheetWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -129,7 +131,7 @@ public class ActivityEvaluationController extends BaseController {
 	@ApiOperation(value = "分页查询曲目", httpMethod="POST", consumes="application/json", produces="application/json")
 	@PostMapping(value="/musicPage", consumes="application/json", produces="application/json")
 	@PreAuthorize("@pcs.hasPermissions('activityEvaluation/musicPage')")
-	public HttpResponseResult<PageInfo<MusicSheetVo>> musicPage(@RequestBody MusicSheetSearch query) {
+	public HttpResponseResult<PageInfo> musicPage(@RequestBody MusicSheetSearch query) {
 		if(null == query.getActivityId()){
 			return failed("活动id不能为空");
 		}
@@ -137,6 +139,17 @@ public class ActivityEvaluationController extends BaseController {
 		query.setState(YesOrNoEnum.YES);
 		query.setAuditVersion(YesOrNoEnum.NO);
 		IPage<MusicSheetVo> musicSheetVoIPage = activityEvaluationService.musicPage(PageUtil.getPage(query), query);
+		List<MusicSheetVo> records = musicSheetVoIPage.getRecords();
+		if(CollectionUtils.isNotEmpty(records)){
+			List<MusicSheetWrapper.MusicSheetVo> musicSheetVos = new ArrayList<>();
+			for (MusicSheetVo record : records) {
+				MusicSheetWrapper.MusicSheetVo vo = JSON.parseObject(JSON.toJSONString(record),MusicSheetWrapper.MusicSheetVo.class);
+				vo.setCbsMusicSheetId(record.getCbsMusicSheetId().toString());
+				vo.setId(record.getId().toString());
+				musicSheetVos.add(vo);
+			}
+			return succeed(PageUtil.pageInfo(com.yonge.cooleshow.biz.dal.dto.PageUtil.transPageInfo(musicSheetVoIPage,musicSheetVos)));
+		}
 		return succeed(PageUtil.pageInfo(musicSheetVoIPage));
 	}
 

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

@@ -445,7 +445,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                 for (MusicSheetVo musicSheetVo : records) {
                     MusicSheetWrapper.MusicSheetVo vo = JSON.parseObject(JSON.toJSONString(musicSheetVo), MusicSheetWrapper.MusicSheetVo.class);
                     vo.setId(musicSheetVo.getId().toString());
-                    vo.setCbsMusicSheetId(musicSheetVo.getCbsMusicSheetId());
+                    if(musicSheetVo.getCbsMusicSheetId() != null){
+                        vo.setCbsMusicSheetId(musicSheetVo.getCbsMusicSheetId().toString());
+                    }
                     MusicSheetAuthRecord sheetDetailVo = authRecordMap.get(musicSheetVo.getId());
                     if(sheetDetailVo == null){
                         continue;

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

@@ -169,7 +169,7 @@ public class MusicSheetWrapper {
         private String id;  //主键ID
 
         @ApiModelProperty(value = "内容平台曲目ID")
-        private Long cbsMusicSheetId;  //主键ID
+        private String cbsMusicSheetId;  //主键ID
 
         @NotBlank(message = "曲谱名称不能为空!")
         @ApiModelProperty(value = "曲谱名称")

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

@@ -93,7 +93,9 @@
                 and ms.exquisite_flag_ = #{param.exquisiteFlag}
             </if>
         </where>
-        group by msar.music_sheet_id_
+        <if test="param.authStatus != null">
+            group by msar.music_sheet_id_
+        </if>
         order by field(msar.audit_state_,'DOING') desc,  msar.update_time_ desc
     </select>
     <select id="findByMusicSheetIds" resultMap="BaseResultMap">