小小训练营

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -357,4 +357,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     //统计重复购买人数
     List<Map<Integer,Long>> getAgainBuyNum(@Param("organIds") List<Integer> organIds);
+
+    List<Map> getStudentCloudStudySequenceDays(@Param("studentIds") List<Integer> studentIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TempLittleArtistTrainingCampDao.java

@@ -35,8 +35,6 @@ public interface TempLittleArtistTrainingCampDao extends BaseMapper<TempLittleAr
      */
     <T> IPage<T> queryUserTrainingDetail(Page<T> page, @Param("param") Map<String, Object> param);
 
-    <T> List<T> queryUserTrainingDetail(@Param("param") Map<String, Object> param);
-
     List<ImGroup> queryCampImGroup(String imGroupIds);
 
     Integer queryUserTrainingPlayTime(@Param("param") Map<String, Object> param);

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TempCampUserTrainingDetailVo.java

@@ -28,6 +28,16 @@ public class TempCampUserTrainingDetailVo implements Serializable {
     private String subjectName;
     @ApiModelProperty(value = "乐团")
     private String musicGroupName;
+    @ApiModelProperty(value = "连续打卡天数")
+    private Integer cloudStudySequenceDays;
+
+    public Integer getCloudStudySequenceDays() {
+        return cloudStudySequenceDays;
+    }
+
+    public void setCloudStudySequenceDays(Integer cloudStudySequenceDays) {
+        this.cloudStudySequenceDays = cloudStudySequenceDays;
+    }
 
     public String getSubjectName() {
         return subjectName;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampServiceImpl.java

@@ -291,11 +291,14 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
             List<Integer> studentIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
             Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(studentDao.getStudentSubjectMapList(studentIds));
             Map<Integer,String> groupNameMap = MapUtil.convertMybatisMap(musicGroupDao.queryNormalGroupName(studentIds));
+            List<Map> map = studentDao.getStudentCloudStudySequenceDays(studentIds);
+            Map<Integer, Integer> studyMap = map.stream().collect(Collectors.toMap(e -> Integer.parseInt(e.get("key").toString()), v -> Integer.parseInt(v.get("value").toString())));
             Integer standardDays = Integer.parseInt(param.get("standardDays").toString());
             for (TempCampUserTrainingDetailVo record : records) {
                 record.setSubjectName(subjectMap.get(record.getId()));
                 record.setMusicGroupName(groupNameMap.get(record.getId()));
                 record.setStandardFlag(record.getPlayDay() >= standardDays);
+                record.setCloudStudySequenceDays(studyMap.get(record.getId()));
             }
         }
         return PageUtil.pageInfo(vos);

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

@@ -1263,6 +1263,12 @@
         </if>
         group by mg.organ_id_
     </select>
+    <select id="getStudentCloudStudySequenceDays" resultType="java.util.Map">
+        select user_id_ 'key',cloud_study_sequence_days_ 'value' from student where user_id_ IN
+        <foreach collection="studentIds" open="(" close=")" item="userId">
+            #{userId}
+        </foreach>
+    </select>
     <sql id="queryStudentBasicInfoSql">
         <where>
             AND su.lock_flag_ = 0 AND su.del_flag_ = 0