From c2a9635771370e7ec908db7e11a5cdd1b5f7bbf0 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期一, 14 七月 2025 17:23:29 +0800
Subject: [PATCH] 修改删除提问词，用户添加和导入设置创建时间
---
src/main/java/com/linghu/service/impl/OrderServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/linghu/service/impl/OrderServiceImpl.java b/src/main/java/com/linghu/service/impl/OrderServiceImpl.java
index c3b8602..5e2d392 100644
--- a/src/main/java/com/linghu/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/linghu/service/impl/OrderServiceImpl.java
@@ -8,15 +8,18 @@
import com.linghu.model.dto.KeywordDto;
import com.linghu.model.dto.OrderDto;
import com.linghu.model.entity.Keyword;
+import com.linghu.model.entity.KeywordTask;
import com.linghu.model.entity.Orders;
import com.linghu.model.entity.Question;
import com.linghu.service.KeywordService;
+import com.linghu.service.KeywordTaskService;
import com.linghu.service.OrderService;
import com.linghu.mapper.OrderMapper;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.linghu.service.QuestionService;
@@ -41,6 +44,8 @@
private QuestionService questionService;
@Autowired
private OrderMapper orderMapper;
+ @Autowired
+ private KeywordTaskService keywordTaskService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -112,7 +117,17 @@
for (Keyword keyword : keywords) {
KeywordDto dto = new KeywordDto();
BeanUtils.copyProperties(keyword, dto);
+ LambdaQueryWrapper<KeywordTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(KeywordTask::getKeyword_id, keyword.getKeyword_id());
+ List<KeywordTask> keywordTasks = keywordTaskService.list(queryWrapper);
+ // 提取 task_id 列表
+ List<String> taskIdList = keywordTasks.stream()
+ .map(KeywordTask::getTask_id)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
+ dto.setTaskIdList(taskIdList); // 设置 task_id 列表
// 查询该关键词下的所有提问词
List<Question> questions = questionService.lambdaQuery()
.eq(Question::getKeyword_id, keyword.getKeyword_id())
@@ -122,7 +137,6 @@
}
return keywordDtos;
}
-
@Override
public Page<String> getClientList(String clientName, Integer pageNum, Integer pageSize) {
Page<Orders> page = new Page<>(pageNum, pageSize);
@@ -132,28 +146,23 @@
queryWrapper.select(Orders::getClient_name) // 只查询客户名称字段
.eq(Orders::getDel_flag, 0) // 只查询未删除的订单
.groupBy(Orders::getClient_name); // 按客户名称分组去重
-
if (clientName != null && !clientName.isEmpty()) {
queryWrapper.like(Orders::getClient_name, clientName);
}
-
- // 执行分页查询
- IPage<Orders> orderPage = orderMapper.selectPage(page, queryWrapper);
+ List<Orders> orders = orderMapper.selectList(queryWrapper);
+// 执行分页查询
+// IPage<Orders> orderPage = orderMapper.selectPage(page, queryWrapper);
// 转换为客户选项列表（统计每个客户的订单数量）
- List<String> clientOptions = orderPage.getRecords().stream()
- .map(order -> {
-
-
- return order.getClient_name();
- })
+ List<String> clientOptions = orders.stream()
+ .map(Orders::getClient_name)
.collect(Collectors.toList());
// 构建结果分页对象
Page<String> resultPage = new Page<>();
- resultPage.setCurrent(orderPage.getCurrent());
- resultPage.setSize(orderPage.getSize());
- resultPage.setTotal(orderPage.getTotal());
+// resultPage.setCurrent(orderPage.getCurrent());
+// resultPage.setSize(orderPage.getSize());
+// resultPage.setTotal(orderPage.getTotal());
resultPage.setRecords(clientOptions);
return resultPage;
--
Gitblit v1.7.1