Merge branch 'zx_saas_training_202303' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -55,6 +55,8 @@ public interface TempLittleArtistTrainingCampDao extends BaseMapper<TempLittleAr
     * @author zx
     * @date 2023/3/15 14:45
     */
-    List<TempLittleArtistTrainingCamp> findTrainingByStudent(@Param("organId") Integer organId, @Param("musicGroupIds") String musicGroupIds);
+    List<TempLittleArtistTrainingCamp> findTrainingByStudent(@Param("organId") Integer organId,
+                                                             @Param("musicGroupIds") String musicGroupIds,
+                                                             @Param("userId") Integer userId);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TempLittleArtistTrainingCamp.java

@@ -112,6 +112,17 @@ public class TempLittleArtistTrainingCamp implements Serializable {
     @TableField(exist = false)
     private Integer userCount;
 
+    @TableField(exist = false)
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     public Boolean getEnableFlag() {
         return enableFlag;
     }

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

@@ -335,7 +335,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         Integer organId = user.getOrganId();
         musicGroupDao.queryUserMusicGroups(user.getId());
         List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(user.getId());
-        List<TempLittleArtistTrainingCamp> campList = this.baseMapper.findTrainingByStudent(organId,StringUtils.join(musicGroupIds,","));
+        List<TempLittleArtistTrainingCamp> campList = this.baseMapper.findTrainingByStudent(organId,StringUtils.join(musicGroupIds,","),user.getId());
         //查询该学员是否购买过该训练营
         TempLittleArtistTrainingCampUserRelation userRelation = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));

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

@@ -230,7 +230,8 @@
           and b.im_group_id_ is not null
     </select>
     <select id="findTrainingByStudent" resultType="com.ym.mec.biz.dal.entity.TempLittleArtistTrainingCamp">
-        select * from temp_little_artist_training_camp tlatc
+        select tlatc.*,tlatcur.state_ status from temp_little_artist_training_camp tlatc
+        left join temp_little_artist_training_camp_user_relation tlatcur ON tlatc.id_ = tlatcur.activity_id_ and tlatcur.user_id_ = #{userId}
         where (INTE_ARRAY(tlatc.music_group_ids_,#{musicGroupIds}) OR tlatc.music_group_ids_ IS NULL) AND
             (FIND_IN_SET(#{organId},tlatc.organ_ids_) OR tlatc.organ_ids_ IS NULL)
           and tlatc.del_flag_ = 0 and tlatc.enable_flag_ = 1 order by id_ DESC