From 4eeed5eb701ac87a4364d8b48e547ce5cb902440 Mon Sep 17 00:00:00 2001
From: cst61 <cst612L@126.com>
Date: Tue, 31 Mar 2026 18:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A4=A7=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E5=8E=86=E5=8F=B2=E9=97=AE=E7=AD=94=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/rj/controller/AiQaMainController.java | 43 +------------------
 .../com/rj/dto/AiQaCustomerAskRequestDto.java |  3 ++
 .../impl/AiQaCustomerAskServiceImpl.java      |  2 +
 3 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/rj/controller/AiQaMainController.java b/src/main/java/com/rj/controller/AiQaMainController.java
index 9b7524a..3f3b2e6 100644
--- a/src/main/java/com/rj/controller/AiQaMainController.java
+++ b/src/main/java/com/rj/controller/AiQaMainController.java
@@ -93,59 +93,20 @@ public class AiQaMainController {
     public ResponseEntity<Map<String, Object>> list(
             @RequestParam(defaultValue = "1") Integer current,
             @RequestParam(defaultValue = "10") Integer size,
-            @RequestParam(required = false) String tenantId,
-            @RequestParam(required = false) String title,
-            @RequestParam(required = false) String qaType,
-            @RequestParam(required = false) String askContent,
             @RequestParam(required = false) String salesId,
             @RequestParam(required = false) String salesPhone,
-            @RequestParam(required = false) String salesName,
-            @RequestParam(required = false) String createStartTime,
-            @RequestParam(required = false) String createEndTime) {
+            @RequestParam(required = false) String salesName ) {
         Map<String, Object> result = new HashMap<>();
         try {
             Page<AiQaMain> page = new Page<>(current, size);
             LambdaQueryWrapper<AiQaMain> q = new LambdaQueryWrapper<>();
-            if (tenantId != null && !tenantId.trim().isEmpty()) {
-                q.eq(AiQaMain::getTenantId, tenantId);
-            }
-            if (title != null && !title.trim().isEmpty()) {
-                q.like(AiQaMain::getTitle, title);
-            }
-            if (qaType != null && !qaType.trim().isEmpty()) {
-                q.eq(AiQaMain::getQaType, qaType);
-            }
-            if (askContent != null && !askContent.trim().isEmpty()) {
-                q.like(AiQaMain::getAskContent, askContent);
-            }
-            if (salesId != null && !salesId.trim().isEmpty()) {
-                q.eq(AiQaMain::getSalesId, salesId);
-            }
             if (salesPhone != null && !salesPhone.trim().isEmpty()) {
                 q.like(AiQaMain::getSalesPhone, salesPhone);
             }
             if (salesName != null && !salesName.trim().isEmpty()) {
-                q.like(AiQaMain::getSalesName, salesName);
+                q.eq(AiQaMain::getSalesName, salesName);
             }
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            if (createStartTime != null && !createStartTime.trim().isEmpty()) {
-                try {
-                    q.ge(AiQaMain::getCreateTime, LocalDateTime.parse(createStartTime, formatter));
-                } catch (Exception ex) {
-                    result.put("success", false);
-                    result.put("message", "创建开始时间格式错误，请使用：yyyy-MM-dd HH:mm:ss");
-                    return ResponseEntity.badRequest().body(result);
-                }
-            }
-            if (createEndTime != null && !createEndTime.trim().isEmpty()) {
-                try {
-                    q.le(AiQaMain::getCreateTime, LocalDateTime.parse(createEndTime, formatter));
-                } catch (Exception ex) {
-                    result.put("success", false);
-                    result.put("message", "创建结束时间格式错误，请使用：yyyy-MM-dd HH:mm:ss");
-                    return ResponseEntity.badRequest().body(result);
-                }
-            }
             q.orderByDesc(AiQaMain::getCreateTime);
             Page<AiQaMain> data = aiQaMainService.page(page, q);
             result.put("success", true);
diff --git a/src/main/java/com/rj/dto/AiQaCustomerAskRequestDto.java b/src/main/java/com/rj/dto/AiQaCustomerAskRequestDto.java
index 16c4d0e..348113e 100644
--- a/src/main/java/com/rj/dto/AiQaCustomerAskRequestDto.java
+++ b/src/main/java/com/rj/dto/AiQaCustomerAskRequestDto.java
@@ -22,6 +22,9 @@ public class AiQaCustomerAskRequestDto {
     @Schema(description = "模型名，默认取配置 ai.qa.local.default-model（如 Qwen2.5-7B-Instruct）")
     private String model;
 
+    private String  loginAccount;
+    private String  userName;
+
     @Schema(description = "可选系统提示词，不传则使用默认助手设定")
     private String systemPrompt;
 
diff --git a/src/main/java/com/rj/service/impl/AiQaCustomerAskServiceImpl.java b/src/main/java/com/rj/service/impl/AiQaCustomerAskServiceImpl.java
index db6bfeb..54804e9 100644
--- a/src/main/java/com/rj/service/impl/AiQaCustomerAskServiceImpl.java
+++ b/src/main/java/com/rj/service/impl/AiQaCustomerAskServiceImpl.java
@@ -91,6 +91,8 @@ public class AiQaCustomerAskServiceImpl implements IAiQaCustomerAskService {
             main.setTitle(truncate(questionContent, MAIN_TITLE_MAX_LEN));
             main.setQaType(questionType);
             main.setAskContent(questionContent);
+            main.setSalesName(request.getUserName());
+            main.setSalesPhone(request.getLoginAccount());
             main.setCreateTime(now);
             main.setUpdateTime(now);
             aiQaMainService.save(main);