diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java index c6c423cab..493c97a09 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseDetailEOController.java @@ -59,6 +59,7 @@ public class CountryCardManageReleaseDetailEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = countryCardManageReleaseDetailEOService.page(page, queryWrapper); + this.countryCardManageReleaseDetailEOService.disposeData(pageList.getRecords(),countryCardManageReleaseDetailEO.getCut()); return Result.OK(pageList); } @@ -70,9 +71,10 @@ public class CountryCardManageReleaseDetailEOController extends JeroController> queryList() { - List list = countryCardManageReleaseDetailEOService.queryList(); - return Result.OK(list); + public Result> queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO,HttpServletRequest req) { + List result = countryCardManageReleaseDetailEOService.queryList(countryCardManageReleaseDetailEO,req); + this.countryCardManageReleaseDetailEOService.disposeData(result,countryCardManageReleaseDetailEO.getCut()); + return Result.OK(result); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java index 6df383189..61fb169dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -1,21 +1,18 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -70,6 +67,10 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @Excel(name = "模板表id", width = 15) @ApiModelProperty(value = "模板表id") private java.lang.String countryCardTempId; + /**标签名称**/ + @TableField(exist = false) + @ApiModelProperty(value = "标签名称") + private java.lang.String countryCardTempIdName; /**描述*/ @Excel(name = "描述", width = 15) @@ -81,4 +82,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @ApiModelProperty(value = "内容") private java.lang.String content; + + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index dd152f332..7287306a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -1,8 +1,6 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -18,8 +16,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - /** * @Description: 问题知识库表 @@ -100,9 +96,9 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**内容（正文）*/ @Excel(name = "内容（正文）", width = 15) - private transient java.lang.String contentString; + private java.lang.String content; - private byte[] content; + /*private byte[] content; public byte[] getContent(){ if(contentString==null){ @@ -126,7 +122,7 @@ public class ProblemKnowledgeBaseEO implements Serializable { e.printStackTrace(); } return ""; - } + }*/ /**附件*/ @Excel(name = "附件", width = 15) @ApiModelProperty(value = "附件") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java index 9d078df1b..11c5f9efc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseDetailEOService.java @@ -2,6 +2,8 @@ package com.jero.modules.problemKnowledgeBase.service; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -57,5 +59,12 @@ public interface ICountryCardManageReleaseDetailEOService extends IService queryList(); + List queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java index 949ec4682..ab421eefd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -1,15 +1,28 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; +import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; +import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempItemEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 问题知识库-country_card-管理发布明细表 * @Author: jero-boot @@ -20,6 +33,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl implements ICountryCardManageReleaseDetailEOService { + @Autowired + private ICountryCardTempEOService countryCardTempEOService; + /** * 保存 * @@ -86,7 +102,29 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(CountryCardManageReleaseDetailEO countryCardManageReleaseDetailEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseDetailEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; } + + @Override + public void disposeData(List datas, String cut) { + if (CollectionUtils.isNotEmpty(datas)) { + //获取模板 + List countryCardTempEOList = this.countryCardTempEOService.list(); + + datas.forEach(data -> { + String lableName = countryCardTempEOList.stream().filter(countryCardTempEO -> { + boolean flag = false; + if (StringUtils.equals(data.getCountryCardTempId(), countryCardTempEO.getId())) { + flag = true; + } + return flag; + }).map(CountryCardTempEO::getLableName).collect(Collectors.joining(",")); + data.setCountryCardTempIdName(lableName); + }); + + } + } }