Merge branch 'online' into feature/0826_music

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

@@ -104,6 +104,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             throw new BizException("曲目信息不存在");
         }
         if (param.getAuthStatus().equals(AuthStatusEnum.PASS)) {
+//            MusicSheet update = new MusicSheet();
+//            update.setId(musicSheet.getId());
+//            update.setFirstPassAuditTime(new Date());
 //            musicSheetService.updateById(musicSheet);
             // 修改老师标签
             teacherService.setTeacherTag(musicSheet.getUserId(), TeacherTagEnum.MUSIC);

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

@@ -115,7 +115,7 @@
         (cbs_music_sheet_id_,music_tag_,payment_type_,charge_type_,top_flag_,exquisite_flag_,sort_number_,state_,audit_status_
             ,music_sheet_name_,music_subject_,music_svg_,composer_,accompaniment_type_,play_speed_,
          music_price_,notation_,music_sheet_type_,source_type_,provider_type_,audio_type_,show_fingering_,
-         can_evaluate_,create_by_,user_id_,score_type_,is_all_subject_
+         can_evaluate_,create_by_,user_id_,score_type_,is_all_subject_,first_pass_audit_time_
         )
         values
         <foreach collection="vos" item="item" separator=",">
@@ -140,7 +140,7 @@
             #{item.musicSheetUpdate.showFingering},
             #{item.musicSheetUpdate.canEvaluate},
             #{item.musicSheetUpdate.userId},#{item.musicSheetUpdate.userId},
-            #{item.scoreType},#{item.musicSheetUpdate.isAllSubject}
+            #{item.scoreType},#{item.musicSheetUpdate.isAllSubject},now()
              )
         </foreach>
     </insert>
@@ -987,7 +987,8 @@
                 ms.can_evaluate_ = #{item.musicSheetUpdate.canEvaluate},
                 ms.is_all_subject_ = #{item.musicSheetUpdate.isAllSubject},
                 ms.source_type_ = CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
-                WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER' ELSE 'TENANT' END
+                WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER' ELSE 'TENANT' END,
+                ms.first_pass_audit_time_ = IF(#{item.musicSheetUpdate.sourceType} = 'PERSON' and ms.first_pass_audit_time_ is null, now(), ms.first_pass_audit_time_)
             </if>
             where ms.cbs_music_sheet_id_ = #{item.musicSheetId}
         </foreach>