|
|
@@ -191,7 +191,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
}
|
|
|
TempUserTrainingTimeDetailVo tempUserTrainingTimeDetailVo = new TempUserTrainingTimeDetailVo();
|
|
|
tempUserTrainingTimeDetailVo.setUserId(userId);
|
|
|
- tempUserTrainingTimeDetailVo.setTrainingDate(camp.getTrainStartDate());
|
|
|
+ tempUserTrainingTimeDetailVo.setTrainingDate(DateUtil.toDate(generateDate.toString()));
|
|
|
tempUserTrainingTimeDetailVo.setPlayTime(BigDecimal.ZERO);
|
|
|
tempUserTrainingTimeDetailVo.setIsFinish(0);
|
|
|
resultList.add(tempUserTrainingTimeDetailVo);
|
|
|
@@ -262,6 +262,9 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
//查询该学员是否购买过该训练营
|
|
|
TempLittleArtistTrainingCampUserRelation userRelation = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
|
|
|
.eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
|
|
|
+ if (Objects.isNull(userRelation)) {
|
|
|
+ throw new BizException("没有参与资格!");
|
|
|
+ }
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
result.put("user", userRelation);
|
|
|
if (CollectionUtils.isNotEmpty(campList)) {
|
|
|
@@ -361,7 +364,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
HSSFWorkbook workbook = null;
|
|
|
try {
|
|
|
String[] header = {"学员编号", "学员姓名", "手机号", "群组", "打卡天数", "训练时长（分钟）"};
|
|
|
- String[] body = {"id", "username", "phone", "imGroupName", "playDay","playTime"};
|
|
|
+ String[] body = {"id", "username", "phone", "imGroupName", "playDay", "playTime"};
|
|
|
workbook = POIUtil.exportExcel(header, body, list);
|
|
|
response.setContentType("application/octet-stream");
|
|
|
response.setHeader("Content-Disposition", "attachment;filename=replacement-" + DateUtil.getDate(new Date()) + ".xls");
|
hgw