diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletItemAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletItemAppServiceImpl.java index 4d036e6..4f1bb55 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletItemAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletItemAppServiceImpl.java @@ -1,9 +1,12 @@ package com.playlet.web.service.app.impl; +import cn.hutool.core.util.ObjectUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.playlet.system.domain.PlayletItem; +import com.playlet.system.domain.PlayletItemType; import com.playlet.system.service.IPlayletItemService; +import com.playlet.system.service.IPlayletItemTypeService; import com.playlet.web.service.app.PlayletItemAppService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,10 +22,18 @@ public class PlayletItemAppServiceImpl implements PlayletItemAppService { private final IPlayletItemService iPlayletItemService; + private final IPlayletItemTypeService iPlayletItemTypeService; + @Override public PageInfo getItemPage(PlayletItem playletItem, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List playletItems = iPlayletItemService.selectPlayletItemList(playletItem); + playletItems.forEach(model->{ + if(ObjectUtil.isNotNull(model.getItemType())){ + PlayletItemType itemType = iPlayletItemTypeService.selectPlayletItemTypeById(Long.valueOf(model.getItemType())); + model.setItemTypeName(itemType.getName()); + } + }); return PageInfo.of(playletItems); } diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java index 2e320d0..3c0210a 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java @@ -3,6 +3,7 @@ package com.playlet.system.domain; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.playlet.common.core.domain.BaseEntity; @@ -96,4 +97,9 @@ public class PlayletItem extends BaseEntity{ @Excel(name = "剧场类型") @ApiModelProperty(value = "剧场类型") private Integer itemType; + + @ApiModelProperty(value = "剧场类型名称") + @TableField(exist = false) + private String itemTypeName; + }