From 79a5914a4d2e9be39d85b4f610a23f7a661cec9b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 16:29:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c8ef61563..7e60712c5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -831,5 +831,8 @@ CREATE TABLE `sar_file_compare_res_comment` ( ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` MODIFY COLUMN `technical_file_name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称' AFTER `evaluation_methods`, MODIFY COLUMN `section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节' AFTER `technical_file_name`; - - +-- 问题知识库 字段长度修改 2022-08-08 +ALTER TABLE `laws_weilai`.`problem_knowledge_base` + MODIFY COLUMN `buss_document_library_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id' AFTER `target_market`, + MODIFY COLUMN `stand_number` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号' AFTER `buss_document_library_id`, + MODIFY COLUMN `stand_title` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题' AFTER `stand_number`; From 3cc4215e319fed347e917d964c643a1fe206a086 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 16:40:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../classificationMaintenanceAdd.vue | 41 ++- .../classificationMaintenanceModel.vue | 21 +- .../components/listAddModel.vue | 315 ++++++++++++++++++ .../components/problemKnowledgeBaseAdd.vue | 255 +++++++++++--- .../components/problemKnowledgeBaseList.vue | 22 +- 7 files changed, 590 insertions(+), 68 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b140fafa0..d69a1a14d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1244,4 +1244,6 @@ module.exports = { punctuationmark:'Only English punctuation marks other than the # sign can be entered', created: 'Created', updated:'Updated', + OpenOne:'Open', + Privacy:'Privacy', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 60585341d..06f48e3e8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1345,6 +1345,8 @@ module.exports = { Adjustareasofresponsibility:'调整责任领域', regulatoryTechnicalAssessment:'法规技术评估', punctuationmark:'只能输入除#号外的英文标点符号', + OpenOne:'公开', + Privacy:'私密', created: '创建时间', updated:'更新时间', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue index 5efb6b6bd..b1d02eb16 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -32,12 +32,12 @@ * {{$t('personCharge')}} - + + v-model="formInline.chargePersonIdName"/> @@ -48,7 +48,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index bb5cacdb6..f2bc6ff04 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -3,7 +3,7 @@
- + {{$t('newlyAdded')}} @@ -19,28 +19,28 @@ * {{$t('displayPermission')}}
- + + @change="showPermissionsChange" + v-model="formInline.showPermissions"> - - {{ item.projectName}} + :value="item.value"> + + {{ item.name}}
- +
* {{$t('authorizedUser')}}
- + * {{$t('title')}}
- + {{$t('problemClassification')}}
- - + + + + + {{item.problemLabel}} + + + @@ -88,13 +92,13 @@ * {{$t('market')}} - - + + :triggerChange="false" :dictCode="'region'"/> @@ -105,10 +109,10 @@
{{$t('standardNo')}}
- + @@ -150,10 +154,10 @@ - {{ (formInline.enclosure === 'null' || formInline.enclosure === '' + @click="clickButtonToUpload('accessoryFile')"> + {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' || - formInline.enclosure == null) ? $t('clickUpload') : $t('viewUploadedFiles') + formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -161,9 +165,14 @@ +
+ {{$t('submit')}} +
+ {{$t('pleaseWaitWhileRunning')}} + @@ -175,6 +184,7 @@ import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' + import listAddModel from './listAddModel' import { quillEditor } from 'vue-quill-editor' export default { @@ -182,14 +192,72 @@ components: { PersonnelSelection, uploadFile, - quillEditor + quillEditor, + listAddModel }, data() { return { formInline: {}, - rules: {}, + loading: false, + problemTypeList: [], + rules: { + showPermissions: [ + { + required: true, + message: this.$t('displayPermission') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + studioEngineerName: [ + { + required: true, + message: this.$t('authorizedUser') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + title: [ + { + required: true, + message: this.$t('title') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + problemType: [ + { + required: true, + message: this.$t('problemClassification') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + targetMarket: [ + { + required: true, + message: this.$t('market') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + url: { + add: '/problemKnowledgeBase/problemKnowledgeBaseEO/add', + edit: '/problemKnowledgeBase/problemKnowledgeBaseEO/edit' + }, + isDisplay: false, disabled: false, - projectNameList: [], + projectNameList: [ + { + value: 'Open', + name: this.$t('OpenOne') + }, + { + value: 'Privacy', + name: this.$t('Privacy') + } + ], content: '

I am Example

', editorOption: { // Some Quill options... @@ -203,34 +271,92 @@ }, mounted() { document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') + this.getBase() + if (this.$route.query.id) { + this.queryById() + } }, methods: { + getBase() { + getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { + if (res.success) { + this.problemTypeList = res.result || [] + } else { + this.problemTypeList = [] + } + }) + }, + queryById() { + let query = { + id: this.$route.query.id + } + getAction('/problemKnowledgeBase/problemKnowledgeBaseEO/queryById', query).then((res) => { + if (res.success) { + this.formInline = res.result || {} + this.formInline = { ...this.formInline } + if (this.formInline.showPermissions == 'Privacy'){ + this.isDisplay = true + }else{ + this.isDisplay = false + } + } else { + this.formInline = {} + } + }) + }, + backClick() { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + , + showPermissionsChange(event) { + if (event == 'Open') { + this.isDisplay = false + } else { + this.isDisplay = true + } + } + , onEditorBlur(quill) { console.log('editor blur!', quill) - }, + } + , onEditorFocus(quill) { console.log('editor focus!', quill) - }, + } + , onEditorReady(quill) { console.log('editor ready!', quill) - }, + } + , onEditorChange({ quill, html, text }) { console.log('editor change!', quill, html, text) this.content = html - }, + } + , PersonnelSelectionChange(value, id) { this.formInline[value] = id this.formInline = { ...this.formInline } - }, + } + , handleInput(value) { this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField([value]) }) - }, + } + , bringInDocumentInformationClick() { - - }, + this.$refs.listAddModelRef.addModel(this.formInline) + } + , + listAddModelForm(id, number) { + this.formInline.standNumber = number + this.formInline.bussDocumentLibraryId = id + this.formInline = { ...this.formInline } + } + , clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -242,7 +368,8 @@ this.$refs.uploadFile.perentHandleFunc() } }) - }, + } + , /** 上传文件的回调 */ uploadSuccess(data) { let attIdList = [] @@ -255,6 +382,47 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } } + , + submit() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + let formInline = JSON.parse(JSON.stringify(this.formInline)) + this.loading = true + this.confirmLoading = true + let url = '' + if (this.formInline.id) { + url = this.url.edit + } else { + url = this.url.add + } + formInline.permissionUserList = [] + if (formInline.showPermissions == 'Privacy') { + let studioEngineer = formInline.studioEngineer.split(',') + studioEngineer.forEach(res => { + formInline.permissionUserList.push({ + userId: res + }) + }) + } + postAction(url, formInline).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.loading = false + if (this.$route.query.id) { + + } else { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + } else { + this.loading = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + } } } @@ -381,4 +549,13 @@ .box-button { height: 38px; } + + .submit-button { + width: 100%; + margin-top: 20px; + text-align: right; + padding: 0 32px; + box-sizing: border-box; + } + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 6036c6576..a5cae60f5 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -99,7 +99,7 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { - getInfoList: 'search/document/getFullTextInfoList' + getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' } } }, @@ -108,10 +108,13 @@ }, methods: { onSearch() { - + this.pageNo = 1 + this.getList() }, ResetSearch() { - + this.searchContent = '' + this.pageNo = 1 + this.getList() }, classificationClick() { this.$refs.classificationMaintenanceModelRef.getData() @@ -124,11 +127,14 @@ window.open(newUrl.href, '_blank') }, newlyAddedClick() { - let newUrl = this.$router.resolve({ - path: '/problemKnowledgeBaseAdd', - query: {} + this.$router.push({ + path: '/problemKnowledgeBaseAdd' }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/problemKnowledgeBaseAdd', + // query: {} + // }) + // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page @@ -144,7 +150,7 @@ pageNo: this.pageNo, pageSize: this.pageSize } - postAction(this.url.getInfoList, query).then((res) => { + getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total From eedb9de0224fd1b930b2ad75a2baf2a067bf884c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 17:10:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86=E5=8F=91?= =?UTF-8?q?=E5=B8=83-=E8=8E=B7=E5=8F=96=E9=80=82=E7=94=A8=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8E=A5=E5=8F=A3=E3=80=82?= =?UTF-8?q?=20=E5=88=86=E7=B1=BB-=E5=A4=84=E7=90=86=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/DicCodeEnum.java | 52 +++++++++++++++++++ .../CountryCardManageReleaseEOController.java | 13 +++++ .../ICountryCardManageReleaseEOService.java | 8 +++ ...CountryCardManageReleaseEOServiceImpl.java | 37 +++++++++++++ ...lemKnowledgeBaseClassifyEOServiceImpl.java | 35 +++++++++---- 5 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java new file mode 100644 index 000000000..d109cf276 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -0,0 +1,52 @@ +package com.jero.modules.system.enums; + +/** + * 数据字典code枚举类 + */ +public enum DicCodeEnum { + REGION("适用地区","0","region"), + ; + + String name; + String value; + String code; + + private DicCodeEnum(String name, String value, String code) { + this.name = name; + this.value = value; + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public static String getTextByValue(String value) { + DicCodeEnum[] values = values(); + for (DicCodeEnum dicCodeEnum : values) { + if (dicCodeEnum.value.equals(value)) { + return dicCodeEnum.name; + } + } + return null; + } +} 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 ae2e63e86..2830d355d 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 @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -185,4 +186,16 @@ public class CountryCardManageReleaseEOController extends JeroController> getApplyMarketList() { + Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(); + return result; + } } 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 68de81566..90fd6f872 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 @@ -1,6 +1,8 @@ package com.jero.modules.problemKnowledgeBase.service; import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -72,4 +74,10 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(); } 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 a0a0f6c04..e39493645 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 @@ -2,17 +2,22 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; 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.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Date; @@ -34,6 +39,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl> getApplyMarketList() { + List result = new ArrayList<>(); + + //获取所有的适用地区 + List dictModelList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + + //获取已经创建了country Card的适用地区，该接口只返回，在country Card里面没有的适用地区。 + List countryCardManageReleaseEOList = this.list(); + if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ + result = dictModelList; + }else { + for (DictModel dictModel : dictModelList) { + boolean flag = true; + for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) { + if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){ + flag = false; + break; + } + } + + if(flag){ + result.add(dictModel); + } + } + } + + return Result.OK(result); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java index 4949d9f5f..c8359bbdc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -9,6 +9,9 @@ import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -102,21 +105,33 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl datas) { if (CollectionUtils.isNotEmpty(datas)) { - List userIdList = datas.stream().map(ProblemKnowledgeBaseClassifyEO::getChargePersonId).distinct().collect(Collectors.toList()); + + StringBuffer userIdSb = new StringBuffer(); + for (ProblemKnowledgeBaseClassifyEO data : datas) { + userIdSb.append(data.getChargePersonId() + ","); + } + List userIdList = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIdSb.toString())){ + userIdList = Arrays.asList(userIdSb.toString().substring(0,userIdSb.length()-1).split(",")); + } List userList = this.sysUserService.querySysUserListByIdList(userIdList); datas.forEach(data -> { if(CollectionUtils.isNotEmpty(userList)){ - List sysUsers = userList.stream().filter(user -> { - boolean flag = false; - if (StringUtils.equals(data.getId(), user.getId())) { - flag = true; - } - return flag; - }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(sysUsers)){ - data.setChargePersonIdName(sysUsers.get(0).getUsername()); + String chargePersonId = data.getChargePersonId(); + if(StringUtils.isNotEmpty(chargePersonId)){ + String[] chargePersonIdArr = chargePersonId.split(","); + String chargePersonIdName = userList.stream().filter(user -> { + boolean flag = false; + for (String chargePerson : chargePersonIdArr) { + if(StringUtils.equals(user.getId(),chargePerson)){ + flag = true; + } + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + data.setChargePersonIdName(chargePersonIdName); } } }); From 30f5341748c8eb85654121c0109455ab6172ea34 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 17:14:24 +0800 Subject: [PATCH 4/6] update --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b4155d784..680113bf6 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 @@ -200,7 +200,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemKnowledgeBaseClassifyEOList = new ArrayList<>(); if(StringUtils.isNotEmpty(problemTypeSb.toString())){ - Stream problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct(); + List problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct().collect(Collectors.toList()); QueryWrapper classifyEOQueryWrapper = new QueryWrapper<>(); classifyEOQueryWrapper.lambda().in(ProblemKnowledgeBaseClassifyEO::getId,problemTypeList); problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(classifyEOQueryWrapper); From 6f47ffebaa69b276a491cc0a868db49c391a8093 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 17:24:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 4 +- .../components/problemKnowledgeBaseView.vue | 130 ++++++++++++++---- 2 files changed, 109 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index a5cae60f5..6e291a5a3 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -162,7 +162,9 @@ titleClick(item) { let newUrl = this.$router.resolve({ path: '/problemKnowledgeBaseView', - query: {} + query: { + 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 2d85b178d..c90f35272 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -21,30 +21,23 @@ - {{queryForm[item.value]}}fdgdgdfg + {{queryForm[item.value]}} -
- sfdsfdsf的防控流感的飞机过来看的结果东法兰克感觉地方给了地方国家的分开两个就地方孤苦伶仃附件给领导反馈 - 独守空房了就收到付款了的角色发看来都是风景但是考虑附件第三方库老师积分迪斯科浪费绝对是分类的课时费 - 是反抗拉萨的飞机罗斯福就点十六分就但是发 - 迪斯科浪费电视机分厘卡的设计分类的水库附近的说服力但是积分的历史房价多少发了多少给京东方管理看豆腐干豆腐干看 - a fjsd fklsdjfk s是否考虑技术的反抗类毒素就发的撒开了房间但是发离开打扫房间是开了房间都是老师JFK了的身份圣诞快乐就是的反抗类毒素解放迪斯科浪费是 - 考虑到房价打开拉萨附近分离技术的领导是否打开拉萨范德萨发了开始就发的考虑是否就但是考虑发及代理商开发就十分大师傅看 -
+
- 123456 + {{this.queryForm.browsingHistoryCount}} - - - 123456 + + + {{this.queryForm.praiseCount}} - - - 123456 + + + {{this.queryForm.collectCount}}
@@ -107,7 +100,8 @@