Merge branch 'feature_camp_20230323' into master_saas

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -1275,14 +1275,15 @@
     </select>
 
     <select id="getStudentCloudStudySequenceDaysV2" resultType="com.ym.mec.biz.dal.vo.TempCampUserTrainingSequenceVo">
-        select user_id_ userId,TO_DAYS(DATE_FORMAT(day_,'%Y-%m-%d')) dayNum
-        from user_music_compare_camp_day_data
-        where camp_id_ = #{campId}
-        and user_id_ IN
+        select ucamp.user_id_ userId,TO_DAYS(DATE_FORMAT(ucamp.day_,'%Y-%m-%d')) dayNum
+        from user_music_compare_camp_day_data ucamp
+        left join temp_little_artist_training_camp camp on camp.id_ = ucamp.camp_id_
+        where ucamp.camp_id_ = #{campId}
+        and ucamp.user_id_ IN
         <foreach collection="studentIds" open="(" close=")" item="userId" separator=",">
             #{userId}
         </foreach>
-        group by user_id_,DATE_FORMAT(day_,'%Y-%m-%d')
+        and ucamp.train_time_ &gt;= camp.sign_standard_ * 60
     </select>
     <sql id="queryStudentBasicInfoSql">
         <where>

mec-biz/src/main/resources/config/mybatis/TempLittleArtistTrainingCampMapper.xml

@@ -196,7 +196,7 @@
         d.phone_ AS phone,
         e.name_ AS imGroupName,
         sum( if(ifnull(c.train_time_,0) >= b.sign_standard_ * 60,1,0)) AS playDay,
-        max(ifnull(c.train_time_,0)) AS playTime
+        sum(ifnull(c.train_time_,0)) AS playTime
         FROM
         `temp_little_artist_training_camp_user_relation` `a`
         left join temp_little_artist_training_camp b on b.id_ = a.activity_id_