|
@@ -445,7 +445,9 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
SysUser user = getUser();
|
|
|
//查询训练营人员关系
|
|
|
TempLittleArtistTrainingCampUserRelation campUser = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
|
|
|
- .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
|
|
|
+ .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId())
|
|
|
+ .eq(TempLittleArtistTrainingCampUserRelation::getState, TempLittleArtistTrainingCampUserRelation.APPLY)
|
|
|
+ );
|
|
|
if (Objects.isNull(campUser)) {
|
|
|
return null;
|
|
|
}
|
|
@@ -456,12 +458,12 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
if (Objects.isNull(camp)) {
|
|
|
return null;
|
|
|
}
|
|
|
-
|
|
|
+ LocalDate now = LocalDate.now();
|
|
|
TempCampUserTrainingPlayTimeVo vo = new TempCampUserTrainingPlayTimeVo();
|
|
|
Map<String, Object> param = new HashMap<>();
|
|
|
param.put("userId", user.getId());
|
|
|
- param.put("startTime", DateUtil.dateToString(camp.getTrainStartDate()) + " 00:00:00");
|
|
|
- param.put("endTime", DateUtil.dateToString(camp.getTrainEndDate()) + " 23:59:59");
|
|
|
+ param.put("startTime", now + " 00:00:00");
|
|
|
+ param.put("endTime", now + " 23:59:59");
|
|
|
Integer playTime = baseMapper.queryUserTrainingPlayTime(param);
|
|
|
vo.setPlayTime(playTime);
|
|
|
vo.setTrainStartDate(camp.getTrainStartDate());
|