|
|
@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import org.dromara.business.domain.*;
|
|
|
-import org.dromara.business.domain.bo.ItemsPrizeBo;
|
|
|
import org.dromara.business.domain.bo.TournamentBlindStructuresBo;
|
|
|
import org.dromara.business.domain.dto.ItemsPrizeDto;
|
|
|
import org.dromara.business.domain.dto.TournamentsDto;
|
|
|
+import org.dromara.business.domain.enums.GameStatus;
|
|
|
import org.dromara.business.domain.vo.*;
|
|
|
import org.dromara.business.mapper.*;
|
|
|
-import org.dromara.business.service.IItemsService;
|
|
|
-import org.dromara.common.core.utils.MapstructUtils;
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
@@ -31,7 +29,6 @@ import org.dromara.business.service.ITournamentsService;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
@@ -113,6 +110,9 @@ public class TournamentsServiceImpl implements ITournamentsService {
|
|
|
|
|
|
}
|
|
|
tournamentsVo.setItemsPrizeList(itemsPrizeList);
|
|
|
+
|
|
|
+ String statusText= GameStatus.getDescriptionFromCode(tournamentsVo.getStatus());
|
|
|
+ tournamentsVo.setStatusText(statusText);
|
|
|
}
|
|
|
|
|
|
return tournamentsVo;
|
|
|
@@ -132,6 +132,8 @@ public class TournamentsServiceImpl implements ITournamentsService {
|
|
|
List<TournamentsVo> records = result.getRecords();
|
|
|
for (TournamentsVo record : records) {
|
|
|
Long tournamentId = record.getId();
|
|
|
+ String statusText= GameStatus.getDescriptionFromCode(record.getStatus());
|
|
|
+ record.setStatusText(statusText);
|
|
|
//赛事报名条件
|
|
|
TournamentEntryConditionsVo tournamentEntryConditionsVo = tournamentEntryConditionsMapper.selectByTournamentInfo(tournamentId);
|
|
|
if(tournamentEntryConditionsVo!=null){
|