From 9a34ef1f3c2aea28705939eb1dc32c28f1222ad9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期四, 10 七月 2025 18:41:48 +0800
Subject: [PATCH] 修改
---
src/main/java/com/linghu/controller/OrderController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/linghu/controller/OrderController.java b/src/main/java/com/linghu/controller/OrderController.java
index 3b7fb30..a26b7d2 100644
--- a/src/main/java/com/linghu/controller/OrderController.java
+++ b/src/main/java/com/linghu/controller/OrderController.java
@@ -18,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.Date;
@@ -169,7 +170,7 @@
@RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) String clientName,
@RequestParam(required = false) Integer status,
- @RequestParam(required = false) String createTime) {
+ @RequestParam(required = false) String timeRange) {
LambdaQueryWrapper<Orders> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Orders::getDel_flag, 0);
@@ -181,10 +182,32 @@
if (status != null) {
queryWrapper.eq(Orders::getStatus, status);
}
- if (createTime != null) {
- queryWrapper.like(Orders::getCreate_time, createTime);
- }
+ // 改造时间筛选逻辑
+ if (timeRange != null && !timeRange.trim().isEmpty()) {
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime startTime = null;
+ switch (timeRange.trim()) {
+ case "week":
+ startTime = now.minusWeeks(1);
+ break;
+ case "month":
+ startTime = now.minusMonths(1);
+ break;
+ case "threeMonths":
+ startTime = now.minusMonths(3);
+ break;
+ case "year":
+ startTime = now.minusYears(1);
+ break;
+ default:
+ // 可添加日志记录无效参数
+ break;
+ }
+ if (startTime != null) {
+ queryWrapper.ge(Orders::getCreate_time, startTime);
+ }
+ }
// 分页查询
if (pageNum != null && pageSize != null) {
Page<Orders> pageInfo = new Page<>(pageNum, pageSize);
@@ -201,9 +224,27 @@
return ResponseResult.success(page);
}
+ /**
+ * 获取客户列表
+ * @param
+ * @return
+ */
+ @GetMapping("/clientList")
+ @ApiOperation("获取客户列表")
+ public ResponseResult<CustomPage<String>> getClientList(@RequestParam(required = false) String clientName,
+ @RequestParam(required = false,defaultValue = "1") Integer pageNum,
+ @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+
+ Page<String> result = orderService.getClientList(clientName,pageNum, pageSize);
+
+
+ return ResponseResult.success(new CustomPage<>( result));
+ }
+
+
@GetMapping("/{orderId}/keywordList")
@ApiOperation("获取订单关联的关键词及提问词")
- public ResponseResult<List<KeywordDto>> getKeywordList(@PathVariable String orderId) {
+ public ResponseResult<List<KeywordDto>> getKeywordList(@PathVariable String orderId){
List<KeywordDto> result = orderService.getKeywordListByOrderId(orderId);
return ResponseResult.success(result);
}
--
Gitblit v1.7.1