From 6727c89745faa938cc053fa67ea3b9f819f5cbfe Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 16 七月 2025 16:46:20 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/linghu/controller/KeywordController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java
index 751c723..e4de724 100644
--- a/src/main/java/com/linghu/controller/KeywordController.java
+++ b/src/main/java/com/linghu/controller/KeywordController.java
@@ -161,6 +161,8 @@
@RequestParam(value = "typeId", required = false) Integer typeId,
@RequestParam(value = "isNow") Integer isNow) {
Keyword keyword = keywordService.getById(keywordId);
+
+
if (isNow == 0) {
List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId,
keyword.getNum() , typeId);
@@ -203,6 +205,7 @@
List<String> typeNameList = result.stream()
.map(PlatformProportionVO::getType_name)
.filter(Objects::nonNull)
+ .distinct()
.collect(Collectors.toList());
// 3. 导出Excel
@@ -463,11 +466,11 @@
// 定义日期格式化器
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
Map<String, FeedExportExcel> timeMap = references.stream()
+ .filter(excel -> excel.getCreate_time() != null)
.collect(Collectors.toMap(
excel -> excel.getCreate_time().format(formatter),
-
- excel -> excel, // Value映射
- (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
+ excel -> excel,
+ (oldValue, newValue) -> oldValue
));
try {
--
Gitblit v1.7.1