From eac2f23054a74df5dc27f96b2deb2d746fd4979d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 14:51:25 +0800 Subject: [PATCH] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86=E5=8F=91?= =?UTF-8?q?=E5=B8=83=20-=20=E5=AF=B9=E6=AF=94=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountryCardManageReleaseEOController.java | 13 ++++++++++ .../CountryCardManageReleaseDetailEO.java | 8 ++++++- .../ICountryCardManageReleaseEOService.java | 2 ++ ...yCardManageReleaseDetailEOServiceImpl.java | 24 ++++++++++++++++++- ...CountryCardManageReleaseEOServiceImpl.java | 13 ++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 851025236..765249182 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -198,4 +198,17 @@ public class CountryCardManageReleaseEOController extends JeroController> result = this.countryCardManageReleaseEOService.getApplyMarketList(); return result; } + + /** + * 根据多个适用地区查询数据 + * + * @return + */ + @AutoLog(value = "问题知识库-country_card-管理发布表-根据多个适用地区查询数据") + @ApiOperation(value="问题知识库-country_card-管理发布表-根据多个适用地区查询数据", notes="问题知识库-country_card-管理发布表-根据多个适用地区查询数据") + @PostMapping(value = "/queryCountryCardManageReleaseByApplyMarkets") + public Result> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) { + List list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params); + return Result.OK(list); + } } 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 f8ceb17fd..9f53f8850 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,6 +1,8 @@ package com.jero.modules.problemKnowledgeBase.entity; import java.io.Serializable; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -70,7 +72,7 @@ public class CountryCardManageReleaseDetailEO implements Serializable { /**标签名称**/ @TableField(exist = false) @ApiModelProperty(value = "标签名称") - private java.lang.String countryCardTempIdName; + private java.lang.String lableName; /**描述*/ @Excel(name = "描述", width = 15) @@ -89,4 +91,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "标签类型") private String lableType; + + /**Country Card模板维护-字典项实体*/ + @TableField(exist = false) + private List countryCardTempItemEOList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 90fd6f872..6ebb80fa9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -80,4 +80,6 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(); + + List queryCountryCardManageReleaseByApplyMarkets(JSONObject params); } 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 0d26284a4..ed5742f5e 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 @@ -5,6 +5,7 @@ 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.enums.LableTypeEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService; @@ -35,6 +36,8 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl countryCardTempEOList = this.countryCardTempEOService.list(); + List countroCardTempIdList = countryCardTempEOList.stream().map(CountryCardTempEO::getId).distinct().collect(Collectors.toList()); + QueryWrapper tempItemEOQueryWrapper = new QueryWrapper<>(); + tempItemEOQueryWrapper.lambda().in(CountryCardTempItemEO::getCountryCardTempId,countroCardTempIdList); + List countryCardTempItemEOList = this.countryCardTempItemEOService.list(tempItemEOQueryWrapper); + datas.forEach(data -> { List countryCardTemp = countryCardTempEOList.stream().filter(countryCardTempEO -> { boolean flag = false; @@ -122,9 +130,23 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl collect = countryCardTempItemEOList.stream().filter(countryCardTempItemEO -> { + boolean flag = false; + if (StringUtils.equals(data.getCountryCardTempId(), countryCardTempItemEO.getCountryCardTempId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + data.setCountryCardTempItemEOList(collect); + } }); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index e39493645..d42890a3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -132,6 +132,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl releaseDetailEOQueryWrapper = new QueryWrapper<>(); releaseDetailEOQueryWrapper.lambda().in(CountryCardManageReleaseDetailEO::getCountryCardManageReleaseId,CountryCardManageReleaseEOId); List releaseDetailEOList = this.countryCardManageReleaseDetailEOService.list(releaseDetailEOQueryWrapper); + this.countryCardManageReleaseDetailEOService.disposeData(releaseDetailEOList,cut); datas.forEach(data -> { if (StringUtils.isNotEmpty(data.getReleaseStatus())) { @@ -196,4 +197,16 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryCountryCardManageReleaseByApplyMarkets(JSONObject params) { + String applyMarkets = params.getString("applyMarkets"); + String cut = params.getString("cut"); + List applyMarketList = Arrays.asList(applyMarkets.split(",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(CountryCardManageReleaseEO::getApplyMarket,applyMarketList); + List result = this.list(queryWrapper); + this.disposeData(result,cut); + return result; + } }