From cea175474c529d98fe11c6c0d254273472d7baf4 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Tue, 5 Mar 2024 09:54:37 +0800 Subject: [PATCH] =?UTF-8?q?24-03-05=20=E6=88=91=E5=8F=91=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E4=BB=BB=E5=8A=A1=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskmanage/entity/ChatHistoryEntity.java | 4 +++ .../service/impl/ChatHistoryServiceImpl.java | 26 +++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/heai/modules/taskmanage/entity/ChatHistoryEntity.java b/src/main/java/com/heai/modules/taskmanage/entity/ChatHistoryEntity.java index 80f3887..b5f3484 100644 --- a/src/main/java/com/heai/modules/taskmanage/entity/ChatHistoryEntity.java +++ b/src/main/java/com/heai/modules/taskmanage/entity/ChatHistoryEntity.java @@ -1,5 +1,6 @@ package com.heai.modules.taskmanage.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -34,4 +35,7 @@ public class ChatHistoryEntity implements Serializable { private Integer taskId; + @TableField(exist = false) + private String allOrOne; + } diff --git a/src/main/java/com/heai/modules/taskmanage/service/impl/ChatHistoryServiceImpl.java b/src/main/java/com/heai/modules/taskmanage/service/impl/ChatHistoryServiceImpl.java index a6d712e..4d31b10 100644 --- a/src/main/java/com/heai/modules/taskmanage/service/impl/ChatHistoryServiceImpl.java +++ b/src/main/java/com/heai/modules/taskmanage/service/impl/ChatHistoryServiceImpl.java @@ -1,6 +1,7 @@ package com.heai.modules.taskmanage.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.heai.common.constant.OssFileConstant; import com.heai.common.utils.PageUtils; import com.heai.common.utils.Query; @@ -18,6 +19,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -28,6 +30,7 @@ import com.heai.modules.taskmanage.dao.ChatHistoryDao; import com.heai.modules.taskmanage.entity.ChatHistoryEntity; import com.heai.modules.taskmanage.service.ChatHistoryService; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; @Service("chatHistoryService") @@ -54,11 +57,24 @@ public class ChatHistoryServiceImpl extends ServiceImpl chatHistoryList(ChatHistoryEntity params) { - return lambdaQuery() - .eq(ChatHistoryEntity::getSite,params.getSite()) - .eq(ChatHistoryEntity::getTaskId,params.getTaskId()) - .orderBy(true,false,ChatHistoryEntity::getCreateDate) - .list(); + if (Objects.isNull(params.getTaskId())){ + throw new RuntimeException("任务编码不存在"); + } + LambdaQueryChainWrapper wrapper = lambdaQuery() + .eq(ChatHistoryEntity::getSite, params.getSite()) + .orderByDesc(ChatHistoryEntity::getCreateDate); + if (StringUtils.hasText(params.getAllOrOne()) && "Y".equals(params.getAllOrOne())){ + // 根据id获取taskDetail + TaskDetailEntity detail = taskDetailService.lambdaQuery().eq(TaskDetailEntity::getId, params.getTaskId()).one(); + if (Objects.isNull(detail)){ + throw new RuntimeException("任务编码不存在"); + } + List list = taskDetailService.lambdaQuery().eq(TaskDetailEntity::getTaskId, detail.getTaskId()).list(); + List ids = list.stream().map(TaskDetailEntity::getId).collect(Collectors.toList()); + return wrapper.in(ChatHistoryEntity::getTaskId,ids).list(); + } + return wrapper.eq(ChatHistoryEntity::getTaskId,params.getTaskId()).list(); + } @Override