- 
+ ![]()
{{item.applyMarket_dictText}}
@@ -144,7 +144,7 @@
path: '/countryCardView',
query: {
applyMarket: row.applyMarket,
- id: row.id,
+ id: row.id
}
})
window.open(newUrl.href, '_blank')
@@ -216,14 +216,14 @@
}
.content-box-box-img {
- width: 70%;
+ width: 238px;
height: 100%;
border-right: 1px #d9d9d9 solid;
}
.content-box-box-text {
+ width: calc(100% - 238px);
display: inline-block;
- width: 30%;
text-align: center;
font-size: 18px;
font-weight: 500;
@@ -234,6 +234,7 @@
width: 100%;
text-align: right;
margin-top: 20px;
+ margin-bottom: 20px;
}
.operator-text {
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
index 6c194fd8a..e73433631 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
@@ -23,22 +23,37 @@
+
-
-
-
+
+
![]()
-
+ ![]()
- 中国
+ {{item2.applyMarket_dictText}}
@@ -47,8 +62,11 @@
+
-
-
- 中国
-
+
+ {{$t('viewFile')}}
+
+
+ {{item2.lableName}}
+
+
+
+
+
+
-
- 中国
-
+
+ {{$t('viewFile')}}
+
+
+ {{item2.lableName}}
+
+
+
+
+
+
- *
{{$t('comparisonMarket')+(index+1)}}
- {{$t('recentHotSpots')}}
- {{$t('disseminationMaterials')}}
- {{$t('informationSafety')}}
- {{$t('blueBook')}}
- {{$t('invoiceCollection')}}
- {{$t('productHighlights')}}
- {{$t('financialReimbursement')}}
+
+
+ {{ tag.problemLabel }}
+
+
@@ -91,9 +93,12 @@
searchContent: '',
checkboxText: [],
conList: [],
+ searchStr: '',
total: 0,
+ selectedTags: [],
loading: false,
pageSize: 10,
+ tagList: [],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
pageNo: 1,
url: {
@@ -103,12 +108,29 @@
},
mounted() {
this.getList()
+ this.replacePage()
},
methods: {
+ replacePage() {
+ getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => {
+ if (res.success) {
+ this.tagList = res.result
+ } else {
+ this.tagList = []
+ }
+ })
+ },
onSearch() {
this.pageNo = 1
this.getList()
},
+ handleChange(tag, checked) {
+ const { selectedTags } = this
+ const nextSelectedTags = checked
+ ? [...selectedTags, tag]
+ : selectedTags.filter(t => t !== tag)
+ this.selectedTags = nextSelectedTags
+ },
ResetSearch() {
this.searchStr = ''
this.pageNo = 1
@@ -128,11 +150,6 @@
this.$router.push({
path: '/problemKnowledgeBaseAdd'
})
- // let newUrl = this.$router.resolve({
- // path: '/problemKnowledgeBaseAdd',
- // query: {}
- // })
- // window.open(newUrl.href, '_blank')
},
pageOnChange(page, pageSize) {
this.pageNo = page
@@ -323,4 +340,19 @@
text-align: center;
line-height: 10;
}
+
+
\ No newline at end of file
From 0f3bcd0b9629e80b0b91ad745bf8851e296ab42f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 10 Aug 2022 17:19:11 +0800
Subject: [PATCH 22/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/initiatingProcess.vue | 17 +++++++++++--
.../components/initiatingProcess.vue | 6 +++++
.../processForm/evaluationProcess/index.vue | 9 ++++++-
.../processForm/handshakeProcess/index.vue | 25 ++++++++++++++++---
.../processForm/regulatoryProcess/index.vue | 9 ++++++-
.../processForm/taskListProcess/index.vue | 6 +++++
.../components/listOfRegulations.vue | 6 +++++
7 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 8201e8ed5..c2042a3c1 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -350,13 +350,23 @@
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
- this.completeTask(value, res.result)
+ this.completeTask(value, res.result, true)
} else {
this.JLoading = false
}
})
},
- completeTask(value, taskId) {
+ deleteProcessInstanceByTask(taskId) {
+ getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => {
+ })
+ },
+ completeTask(value, taskId, isTrue) {
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: taskId,
@@ -375,6 +385,9 @@
} else {
this.JLoading = false
this.$message.warning(this.$t('operationFailed'))
+ if (isTrue) {
+ this.deleteProcessInstanceByTask(taskId)
+ }
}
})
}
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 8cdb5103a..1ef583d29 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -564,6 +564,12 @@
})
},
completeTask(value, taskId) {
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: taskId,
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 59f0fa530..ac1f757f6 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -307,11 +307,18 @@
}
},
completeTask() {
+ let value = JSON.parse(JSON.stringify(this.queryProject))
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskIds,
flag: this.queryProject.flag,
- json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
+ json: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index c5390aa79..533a748a9 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -186,6 +186,12 @@
completeTask(value, handlingTime) {
let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
let data = JSON.stringify(json).replace(/\"/g, '\'')
+ Object.keys(data).forEach(res => {
+ if (data[res] && data[res] instanceof String) {
+ data[res] = data[res].replace(/\"/g, '“')
+ data[res] = data[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskId || this.$route.query.taskIds,
@@ -248,15 +254,24 @@
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
- this.completeTaskDesign(value, res.result)
+ this.completeTaskDesign(value, res.result,true)
}
})
},
-
- completeTaskDesign(value, taskId) {
+ deleteProcessInstanceByTask(taskId) {
+ getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => {
+ })
+ },
+ completeTaskDesign(value, taskId,isTrue) {
value.reviewResult = 'launch'
let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
value.operatorTime = operatorTime
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: taskId,
@@ -272,6 +287,10 @@
// this.$router.push({
// path: '/ProcessCenter'
// })
+ }else{
+ if (isTrue) {
+ this.deleteProcessInstanceByTask(taskId)
+ }
}
})
},
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 503b8409d..604e429ce 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -171,10 +171,17 @@
// this.insertBatch(dataList, 2)
},
completeTask() {
+ let value = JSON.parse(JSON.stringify(this.queryProject))
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskIds,
- json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
+ json: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 20412f416..efb58fae4 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -342,6 +342,12 @@
completeTask(value) {
let json = Object.assign(this.queryBy, value)
let data = JSON.stringify(json).replace(/\"/g, '\'')
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskId || this.$route.query.taskIds,
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index dbf4800e9..e289457ce 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1697,6 +1697,12 @@
completeTask(value, taskId, index) {
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
value.handlingTime = handlingTime
+ Object.keys(value).forEach(res => {
+ if (value[res] && value[res] instanceof String) {
+ value[res] = value[res].replace(/\"/g, '“')
+ value[res] = value[res].replace(/\'/g, '‘')
+ }
+ })
let query = {
userid: this.userInfo().id,
taskId: taskId,
From 90affdb471bee3d577c87e9d5a56adf2e1867518 Mon Sep 17 00:00:00 2001
From: gaosong
Date: Wed, 10 Aug 2022 17:21:13 +0800
Subject: [PATCH 23/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E8=BF=87100m=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/jero/common/exception/JeroBootExceptionHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java
index f8ac4228e..9408df97a 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java
@@ -88,7 +88,7 @@ public class JeroBootExceptionHandler {
@ExceptionHandler(MaxUploadSizeExceededException.class)
public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) {
log.error(e.getMessage(), e);
- return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! ");
+ return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! ");
}
@ExceptionHandler(DataIntegrityViolationException.class)
From 552ab024008c620ad6398e12da2d28b31e6fe0fa Mon Sep 17 00:00:00 2001
From: "zyx.net"
Date: Wed, 10 Aug 2022 17:35:32 +0800
Subject: [PATCH 24/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/views/externalReports/index.vue | 3 ++-
jero-web/src/views/parameter/parameterexport/index.vue | 2 +-
.../projectManagement/components/ParameterCollectionEchart.vue | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 8886cdf38..b714d81cd 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -84,8 +84,9 @@
{{$t('content')}}
-
- {{item.content}}
+ {{item.contentOne}}
@@ -130,6 +130,7 @@
? [...selectedTags, tag]
: selectedTags.filter(t => t !== tag)
this.selectedTags = nextSelectedTags
+ this.getList()
},
ResetSearch() {
this.searchStr = ''
@@ -160,16 +161,29 @@
this.pageSize = pageSize
this.getList()
},
+ getText(str) {
+ let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签
+ return words.replace(/\s/g, '') //这里是去除空格
+ },
getList() {
+ let selectedTags = JSON.parse(JSON.stringify(this.selectedTags))
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
- searchStr: this.searchStr
+ searchStr: this.searchStr,
+ problemTypes: selectedTags.join(',')
}
this.loading = true
getAction(this.url.getInfoList, query).then((res) => {
if (res.success) {
this.conList = res.result.records
+ if (this.conList && this.conList.length > 0) {
+ this.conList.forEach(val => {
+ if (val.content) {
+ val.contentOne = this.getText(val.content)
+ }
+ })
+ }
this.total = res.result.total
this.loading = false
} else {
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index 4e824890c..cda30770c 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -22,7 +22,7 @@
+
-
+
+ {{item.contentOne}}
{{$t('edit')}}
@@ -113,6 +114,10 @@
this.pageNo = 1
this.getList()
},
+ getText(str) {
+ let words = str.replace(/<[^<>]+>/g, '').replace(/ /gi, '') //这里是去除标签
+ return words.replace(/\s/g, '') //这里是去除空格
+ },
getList() {
let query = {
pageNo: this.pageNo,
@@ -124,6 +129,13 @@
getAction(this.url.getInfoList, query).then((res) => {
if (res.success) {
this.conList = res.result.records
+ if (this.conList && this.conList.length > 0) {
+ this.conList.forEach(val => {
+ if (val.content) {
+ val.contentOne = this.getText(val.content)
+ }
+ })
+ }
this.total = res.result.total
this.loading = false
} else {
@@ -139,11 +151,9 @@
},
titleClick(item) {
let newUrl = this.$router.resolve({
- path: '/docManage/library/detail',
+ path: '/problemKnowledgeBaseView',
query: {
- id: item.id.slice(0, 32),
- title: item.title,
- serial_number: item.serial_number
+ id: item.id
}
})
window.open(newUrl.href, '_blank')
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
index 232ad441e..b651cfbe3 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
@@ -17,6 +17,14 @@
+
+
+ {{$t('issuedBy')}}:{{this.queryForm.createBy}}
+
+
+ {{$t('releaseDate')}}:{{this.queryForm.createTime}}
+
+
{{item.title}}
@@ -104,11 +112,11 @@
standardContentList: [
{
title: this.$t('problemClassification'),
- value: 'problemType'
+ value: 'problemTypeName'
},
{
title: this.$t('market'),
- value: 'targetMarket'
+ value: 'targetMarket_dicText'
},
{
title: this.$t('standardNo'),
@@ -493,4 +501,13 @@
overflow: hidden;
text-align: right;
}
+
+ .content-text-top {
+ width: 100%;
+ text-align: right;
+ color: #040B29;
+ font-weight: 400;
+ font-size: 16px;
+ margin-bottom: 20px;
+ }
\ No newline at end of file
From fddb07f51879f628acaa6cb50397a3aa5bef6337 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 10 Aug 2022 18:18:31 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?=
=?UTF-8?q?=E5=BA=93=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 regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
List finalProblemKnowledgeBaseClassifyEOList = problemKnowledgeBaseClassifyEOList;
datas.forEach(data -> {
@@ -298,6 +305,30 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl {
+ 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 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);
+ });
+ });
+ }
+ });
+ }
}
}