From a52171ecc392fccbf96cedf3a93f989a94d3f1fc Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 9 Aug 2022 14:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93-?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=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 | 4 ++++ .../controller/CountryCardManageReleaseEOController.java | 2 +- .../entity/CountryCardManageReleaseDetailEO.java | 5 ++++- .../entity/CountryCardManageReleaseEO.java | 1 + .../impl/CountryCardManageReleaseDetailEOServiceImpl.java | 8 +++++--- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 7e60712c5..656fbb24f 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -836,3 +836,7 @@ 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`; + +-- 问题知识库 字段类型修改 2022-08-09 +ALTER TABLE `laws_weilai`.`problem_knowledge_base` + MODIFY COLUMN `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容（正文）' AFTER `stand_title`; 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 2830d355d..851025236 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 @@ -61,7 +61,7 @@ public class CountryCardManageReleaseEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = countryCardManageReleaseEOService.page(page, queryWrapper); this.countryCardManageReleaseEOService.disposeData(pageList.getRecords(),cut); - return Result.OK(pageList); + return Result.OK(cut,pageList); } /** 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 61fb169dc..f8ceb17fd 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 @@ -82,8 +82,11 @@ public class CountryCardManageReleaseDetailEO implements Serializable { @ApiModelProperty(value = "内容") private java.lang.String content; - @TableField(exist = false) private String cut; + /**标签类型**/ + @TableField(exist = false) + @ApiModelProperty(value = "标签类型") + private String lableType; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java index 9c556df95..1d3dbfd01 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseEO.java @@ -67,6 +67,7 @@ public class CountryCardManageReleaseEO implements Serializable { /**适用市场*/ @Excel(name = "适用市场", width = 15) @ApiModelProperty(value = "适用市场") + @Dict(dicCode = "region") private java.lang.String applyMarket; /**发布状态*/ 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 ab421eefd..0d26284a4 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 @@ -115,14 +115,16 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl countryCardTempEOList = this.countryCardTempEOService.list(); datas.forEach(data -> { - String lableName = countryCardTempEOList.stream().filter(countryCardTempEO -> { + List countryCardTemp = 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); + }).collect(Collectors.toList()); + data.setCountryCardTempIdName(countryCardTemp.get(0).getLableName()); + + data.setLableType(countryCardTemp.get(0).getLableType()); }); }