Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAuthRecord;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 
 /**
  * 曲目审核表 服务类
@@ -26,4 +27,12 @@ public interface MusicSheetAuthRecordService extends IService<MusicSheetAuthReco
      * @param musicSheetId 曲目id
      */
     void setAuditDoing(Long musicSheetId);
+
+    /**
+     * 获取当前曲目审核理由
+     *
+     * @param musicSheetId 曲目id
+     * @return
+     */
+    String selectAuditReason(Long musicSheetId);
 }

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

@@ -307,7 +307,7 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
 
         url = MessageFormatter.arrayFormat(url, reviewDto.getCourseScheduleId());
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_REVIEW_HOMEWORK,
-        studentReceivers, null, 0, url + reviewDto.getCourseScheduleId() , ClientEnum.STUDENT.getCode(), teacher.getUsername());
+        studentReceivers, null, 0, url , ClientEnum.STUDENT.getCode(), teacher.getUsername());
     }
 
     @Override

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

@@ -756,6 +756,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     @Override
     public boolean checkStudentCourseSchedule(Long studentId, Long courseId) {
         List<CourseScheduleStudentPayment> paymentList = courseScheduleStudentPaymentService.getByCourseId(courseId);
+        if (CollectionUtils.isEmpty(paymentList)) {
+            return false;
+        }
         for (CourseScheduleStudentPayment courseScheduleStudentPayment : paymentList) {
             if (courseScheduleStudentPayment != null && studentId.equals(courseScheduleStudentPayment.getUserId())) {
                 return true;

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

@@ -52,4 +52,18 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
         this.saveOrUpdate(musicSheetAuthRecord);
     }
+
+    @Override
+    public String selectAuditReason(Long musicSheetId) {
+        MusicSheetAuthRecord one = this.lambdaQuery()
+                                       .eq(MusicSheetAuthRecord::getMusicSheetId, musicSheetId)
+                                       .orderByDesc(MusicSheetAuthRecord::getId)
+                                       .last("limit 1")
+                                       .one();
+        if (one == null) {
+            return "";
+        }
+        return one.getReason();
+
+    }
 }

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

@@ -182,6 +182,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (sysUser == null) {
             return detail;
         }
+        if (AuthStatusEnum.UNPASS.getCode().equals(detail.getAuditStatus().getCode())) {
+            String reason = musicSheetAuthRecordService.selectAuditReason(id);
+            detail.setReason(reason);
+        }
         if (ChargeTypeEnum.FREE.getCode().equals(detail.getChargeType().getCode())) {
             detail.setPlay(YesOrNoEnum.YES);
         }  else if (SysUserType.STUDENT.getCode().equals(userType.getCode())) {

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

@@ -40,7 +40,15 @@ public class StudentCourseHomeworkServiceImpl extends ServiceImpl<StudentCourseH
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean submitCourseHome(CourseHomeworkDetailVo courseHomeworkDetailVo, String submit, Long studentId) {
-        StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
+
+        StudentCourseHomework studentCourseHomework = this.lambdaQuery()
+                                        .eq(StudentCourseHomework::getStudentId, studentId)
+                                        .eq(StudentCourseHomework::getCourseScheduleId, courseHomeworkDetailVo.getCourseScheduleId())
+                                        .last("limit 1")
+                                        .one();
+        if (studentCourseHomework == null) {
+            studentCourseHomework = new StudentCourseHomework();
+        }
         studentCourseHomework.setCourseHomeworkId(courseHomeworkDetailVo.getId());
         studentCourseHomework.setCourseGroupType(courseHomeworkDetailVo.getCourseType().getCode());
         studentCourseHomework.setCourseGroupId(courseHomeworkDetailVo.getCourseGroupId());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -40,6 +40,17 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("声部code")
     private String code;
 
+    @ApiModelProperty("审核理由")
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
     public String getCode() {
         return code;
     }

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

@@ -59,7 +59,7 @@
         left join course_schedule_student_payment cssp on cssp.course_id_ = cs.id_
         left join sys_user su on cs.teacher_id_ = su.id_
         left join sys_user su2 on cssp.user_id_ = su2.id_
-        left join student_course_homework sch on ch.id_ = sch.id_
+        left join student_course_homework sch on sch.student_id_ = cssp.user_id_ and sch.course_schedule_id_ = cssp.course_id_
         <where>
             <if test="param.courseStatus != null">
                 and cs.status_ = #{param.courseStatus}