update:修改专辑，曲目的排序

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

@@ -30,6 +30,9 @@ public class MusicAlbumSearch extends QueryInfo{
     @ApiModelProperty("专辑状态0：停用，1：启用")
     private YesOrNoEnum albumStatus;
 
+    @ApiModelProperty(value = "排序规则，1：按收藏人数倒叙",hidden = true)
+    private Integer sortBy;
+
     public String getIdAndName() {
         return idAndName;
     }
@@ -64,4 +67,12 @@ public class MusicAlbumSearch extends QueryInfo{
     public void setAlbumStatus(YesOrNoEnum albumStatus) {
         this.albumStatus = albumStatus;
     }
+
+    public Integer getSortBy() {
+        return sortBy;
+    }
+
+    public void setSortBy(Integer sortBy) {
+        this.sortBy = sortBy;
+    }
 }

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

@@ -83,6 +83,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
     private AuthStatusEnum auditStatus;
 
+	@TableField("submit_audit_time_")
+	@ApiModelProperty(value = "提交审核时间")
+	private Date submitAuditTime;
+
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
     private Integer sortNumber;  //排序号
@@ -345,4 +349,12 @@ public class MusicSheet implements Serializable {
 	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
+
+	public Date getSubmitAuditTime() {
+		return submitAuditTime;
+	}
+
+	public void setSubmitAuditTime(Date submitAuditTime) {
+		this.submitAuditTime = submitAuditTime;
+	}
 }

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

@@ -26,11 +26,10 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                                               .eq(MusicSheetAuthRecord::getMusicSheetId, param.getMusicSheetId())
                                               .eq(MusicSheetAuthRecord::getVerifyUserId, userId)
                                               .list();
+        MusicSheetAuthRecord musicSheetAuthRecord = new MusicSheetAuthRecord();
         if (!CollectionUtils.isEmpty(list)) {
-            throw  new BizException("曲目已经过审批");
+            musicSheetAuthRecord = list.get(0);
         }
-
-        MusicSheetAuthRecord musicSheetAuthRecord = new MusicSheetAuthRecord();
         musicSheetAuthRecord.setMusicSheetId(param.getMusicSheetId());
         musicSheetAuthRecord.setCreateTime(new Date());
         musicSheetAuthRecord.setAuditState(param.getAuthStatus());

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

@@ -152,11 +152,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
                     detail.setPlay(YesOrNoEnum.YES);
                 }
             }
-            // 学生进入云教练练习，添加一条练习记录
-            musicSheetPracticeRecordService.addRecord(id,sysUser.getId());
+
         } else {
             detail.setPlay(YesOrNoEnum.YES);
         }
+        // 学生进入云教练练习，添加一条练习记录
+        musicSheetPracticeRecordService.addRecord(id,sysUser.getId());
         return detail;
     }
 
@@ -233,9 +234,14 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (musicSheet == null) {
             throw  new BizException("未找到曲目信息");
         }
+        if (AuthStatusEnum.DOING.getCode().equals(musicSheet.getAuditStatus().getCode())) {
+            throw  new BizException("曲目已经过审批");
+        }
 
         if (musicSheetAuthRecordService.audit(param,userId)) {
             musicSheet.setAuditStatus(param.getAuthStatus());
+            musicSheet.setUpdateBy(userId);
+            musicSheet.setUpdateTime(new Date());
             return this.updateById(musicSheet);
         } else {
             return false;

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

@@ -58,6 +58,16 @@
                 and t.album_status_ = #{query.albumStatus}
             </if>
         </where>
+        <if test="query.sortBy != null">
+            <choose>
+                <when test="query.sortBy == 1">
+                    order by t2.num desc
+                </when>
+            </choose>
+        </if>
+        <if test="query.sortBy == null">
+            order by t.id_ desc
+        </if>
     </select>
 
     <select id="selectFavoritePage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">

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

@@ -71,6 +71,7 @@
         <where>
             <include refid="QueryInfo"/>
         </where>
+        order by  t.id_ desc
     </select>
 
     <sql id="QueryInfo">
@@ -217,6 +218,7 @@
         <where>
             <include refid="QueryInfo"/>
         </where>
+        order by  t.id_ desc
     </select>
 
     <select id="selectMyMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
@@ -237,6 +239,7 @@
                 and mspr.order_status_ = 1
             </if>
         </where>
+        order by  mspr.id_ desc
     </select>
 
     <select id="selectFavoriteMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
@@ -257,6 +260,7 @@
                 and mf.user_id_ = #{param.studentId}
             </if>
         </where>
+        order by mf.id_ desc
     </select>
 
     <select id="selectPracticeMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
@@ -328,6 +332,7 @@
                 and ms.del_flag_ = #{param.delFlag}
             </if>
         </where>
+        order by mspr.id_ desc
     </select>
 
     <select id="selectTeacherPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo">
@@ -364,6 +369,7 @@
                 and ms.del_flag_ = #{param.delFlag}
             </if>
         </where>
+        order by  ms.id_ desc
     </select>
 
     <select id="selectAuditPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo">
@@ -409,5 +415,6 @@
                 and ms.del_flag_ = #{param.delFlag}
             </if>
         </where>
+        order by  ms.submit_audit_time_ desc
     </select>
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -48,6 +48,7 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setAlbumStatus(YesOrNoEnum.YES);
+        query.setSortBy(1);
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
         return succeed(PageUtil.pageInfo(iPage));
     }

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

@@ -74,6 +74,7 @@ public class MusicSheetController extends BaseController {
 
         musicSheetDto.setUserId(sysUser.getId());
         musicSheetDto.setAuditStatus(AuthStatusEnum.DOING);
+        musicSheetDto.setSubmitAuditTime(new Date());
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
             list = musicSheetDto.getBackground();
@@ -92,6 +93,30 @@ public class MusicSheetController extends BaseController {
         return succeed("新增曲谱成功");
     }
 
+
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheet musicSheet) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicSheet.getId()==null){
+            return failed("缺少ID");
+        }
+
+        musicSheet.setUpdateBy(sysUser.getId());
+        musicSheet.setUpdateTime(new Date());
+        musicSheet.setSubmitAuditTime(new Date());
+        musicSheet.setAuditStatus(AuthStatusEnum.DOING);
+        boolean result = musicSheetService.updateById(musicSheet);
+        if (result){
+            return succeed("修改成功");
+        } else {
+            return failed("修改失败");
+        }
+    }
+
     @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {