From fddb07f51879f628acaa6cb50397a3aa5bef6337 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 10 Aug 2022 18:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?=
 =?UTF-8?q?=E8=81=94=E8=B0=83=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProblemKnowledgeBaseEO.java        | 11 ++++-
 .../ProblemKnowledgeBaseEOServiceImpl.java    | 47 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

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 7287306a9..7d63858bf 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
@@ -72,12 +72,19 @@ public class ProblemKnowledgeBaseEO implements Serializable {
     /**问题分类展示名称*/
 	@TableField(exist = false)
     private java.lang.String problemTypeName;
+    /**问题分类查询条件字段 多个*/
+    @TableField(exist = false)
+    private java.lang.String problemTypes;
 
-	/**市场*/
-    @Dict(dicCode = "region")
+
+    /**市场*/
+    //@Dict(dicCode = "region")
 	@Excel(name = "市场", width = 15)
     @ApiModelProperty(value = "市场")
     private java.lang.String targetMarket;
+	/**市场展示字段**/
+	@TableField(exist = false)
+    private java.lang.String targetMarket_dicText;
 
 	/**文档库id*/
 	@Excel(name = "文档库id", width = 15)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 0455d852a..cad2b60e5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -1,7 +1,9 @@
 package com.jero.modules.problemKnowledgeBase.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.problemKnowledgeBase.entity.*;
 import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum;
@@ -9,6 +11,8 @@ import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum;
 import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.*;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
@@ -44,6 +48,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 	private IProblemKnowledgeBaseBrowsingHistoryEOService problemKnowledgeBaseBrowsingHistoryEOService;
 	@Autowired
 	private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService;
+	@Autowired
+	private ISysDictService sysDictService;
 
 	/**
 	 * 保存
@@ -209,6 +215,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(classifyEOQueryWrapper);
 			}
 
+			List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 
 			List<ProblemKnowledgeBaseClassifyEO> finalProblemKnowledgeBaseClassifyEOList = problemKnowledgeBaseClassifyEOList;
 			datas.forEach(data -> {
@@ -298,6 +305,30 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 					data.setProblemTypeName(problemTypeName);
 				}
+
+				String targetMarket = data.getTargetMarket();
+				if(StringUtils.isNotEmpty(targetMarket) && CollectionUtils.isNotEmpty(regionList)){
+					String targetMarket_dicText = "";
+					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+						targetMarket_dicText = regionList.stream().filter(region -> {
+							boolean flag = false;
+							if (StringUtils.equals(targetMarket, region.getValue())) {
+								flag = true;
+							}
+							return flag;
+						}).map(DictModel::getText).collect(Collectors.joining(","));
+					}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+						targetMarket_dicText = regionList.stream().filter(region -> {
+							boolean flag = false;
+							if (StringUtils.equals(targetMarket, region.getValue())) {
+								flag = true;
+							}
+							return flag;
+						}).map(DictModel::getTextEn).collect(Collectors.joining(","));
+					}
+
+					data.setTargetMarket_dicText(targetMarket_dicText);
+				}
 			});
 		}
 	}
@@ -335,5 +366,21 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				query.or().like(ProblemKnowledgeBaseEO::getContent,searchStr);
 			});
 		}
+
+		//根据分类查询 ，包含就查出来。
+		String problemTypes = problemKnowledgeBaseEO.getProblemTypes();
+		if(StringUtils.isNotEmpty(problemTypes)){
+			List<String> problemTypeList = Arrays.asList(problemTypes.split(","));
+			queryWrapper.and(query -> {
+				query.lambda().like(ProblemKnowledgeBaseEO::getProblemType,problemTypes);
+				if(CollectionUtils.isNotEmpty(problemTypeList)){
+					problemTypeList.forEach(type -> {
+						query.or(q -> {
+							q.lambda().like(ProblemKnowledgeBaseEO::getProblemType,type);
+						});
+					});
+				}
+			});
+		}
 	}
 }