Merge branch 'feature/0826_music' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetDao.java

@@ -223,4 +223,6 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
     void tenantInsert(@Param("item") CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend extend);
 
     void platformInsert(@Param("item") CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend extend);
+
+    void updateState(@Param("ids") String ids);
 }

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

@@ -128,6 +128,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
             musicSheetService.getDao().batchEnable(updateMusicSheet.getIds(),updateMusicSheet.getStatus(),true);
         } else {
             musicSheetService.getDao().batchEnable(updateMusicSheet.getIds(),updateMusicSheet.getStatus(),false);
+            musicSheetService.getDao().updateState(updateMusicSheet.getIds());
         }
         return true;
     }

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

@@ -315,7 +315,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = rows.get(0);
         CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus extendStatus = new CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus();
         extendStatus.setIds(musicSheetApplication.getApplicationExtendId().toString());
-        extendStatus.setStatus(musicSheet.getState()!=YesOrNoEnum.YES);
+        extendStatus.setStatus(!musicSheet.getClientState());
         R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendStatus(extendStatus);
         if (jsonObjectR.getCode() != 200) {
             throw new BizException("修改曲目状态失败,{}", jsonObjectR.getMessage());

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

@@ -1000,7 +1000,6 @@
                 tenant_state_ = #{status},
             </if>
             <if test="tenantFlag == 0">
-                state_ = #{status},
                 client_state_ = #{status}
             </if>
         </set>
@@ -1212,7 +1211,8 @@
             ms.can_evaluate_ = #{item.musicSheetUpdate.canEvaluate},
             ms.source_type_ = CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
             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_)
+            ms.first_pass_audit_time_ = IF((#{item.musicSheetUpdate.sourceType} = 'PERSON' and ms.first_pass_audit_time_ is null) or !find_in_set('PLATFORM',ms.provider_type_),
+            now(), ms.first_pass_audit_time_)
         </if>
         where ms.cbs_music_sheet_id_ = #{item.musicSheetId}
     </update>
@@ -1222,7 +1222,7 @@
         (cbs_music_sheet_id_,tenant_sort_number_,tenant_score_type_,tenant_state_,tenant_notation_,tenant_category_id_
         ,music_sheet_name_,music_subject_,music_svg_,composer_,accompaniment_type_,play_speed_,
         music_sheet_type_,provider_type_,audio_type_,show_fingering_,
-        can_evaluate_,create_by_,user_id_,audit_status_,upload_time_
+        can_evaluate_,create_by_,user_id_,audit_status_,upload_time_,source_type_
         )
         values
             (#{item.musicSheetId},
@@ -1243,7 +1243,10 @@
             #{item.musicSheetUpdate.userId},
             'PASS',
 
-        #{item.musicSheetUpdate.createTime}
+        #{item.musicSheetUpdate.createTime},
+        CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
+        WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER'
+        ELSE 'TENANT' END
             )
     </insert>
 
@@ -1282,5 +1285,11 @@
         now()
         )
     </insert>
+
+    <update id="updateState">
+        update music_sheet
+        set state_ = client_state_ and platform_state_
+        where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
+    </update>
     <!--单曲专辑数量统计-->
 </mapper>