From 55d9851cf1be6cc0aa9dbf2d23a6e87cca915772 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Sep 2025 14:40:21 +0800
Subject: [PATCH] feat(ai): 新增根据ID列表查询公司信息功能
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyServiceImpl.java | 33 +++++++++++++++++++++++++++++++--
src/main/resources/templates/febs/views/modules/ai/aiCompany/list.html | 2 +-
src/main/resources/templates/febs/views/modules/ai/workflow/list.html | 2 +-
src/main/java/cc/mrbird/febs/ai/entity/AiCompanyWorkflow.java | 4 ++++
src/main/java/cc/mrbird/febs/ai/service/AiCompanyService.java | 2 ++
5 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/entity/AiCompanyWorkflow.java b/src/main/java/cc/mrbird/febs/ai/entity/AiCompanyWorkflow.java
index 2c3934d..bf4400e 100644
--- a/src/main/java/cc/mrbird/febs/ai/entity/AiCompanyWorkflow.java
+++ b/src/main/java/cc/mrbird/febs/ai/entity/AiCompanyWorkflow.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.ai.entity;
import cc.mrbird.febs.common.entity.AiBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -23,4 +24,7 @@
* 代码标识
*/
private String code;
+
+ @TableField(exist = false)
+ private String companyName;
}
diff --git a/src/main/java/cc/mrbird/febs/ai/service/AiCompanyService.java b/src/main/java/cc/mrbird/febs/ai/service/AiCompanyService.java
index d071784..3654ec3 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/AiCompanyService.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/AiCompanyService.java
@@ -8,10 +8,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Date;
+import java.util.List;
public interface AiCompanyService extends IService<AiCompany> {
AiCompany getById(String id);
+ List<AiCompany> getListById(List<String> ids);
FebsResponse add(AiCompany dto);
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyServiceImpl.java
index f68864b..5a1a242 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyServiceImpl.java
@@ -2,13 +2,13 @@
import cc.mrbird.febs.ai.entity.AiCompany;
import cc.mrbird.febs.ai.entity.AiCompanyWorkflow;
-import cc.mrbird.febs.ai.entity.AiMemberRole;
import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
import cc.mrbird.febs.ai.mapper.AiCompanyWorkflowMapper;
import cc.mrbird.febs.ai.service.AiCompanyService;
import cc.mrbird.febs.ai.util.UUID;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,7 +19,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -32,6 +33,13 @@
@Override
public AiCompany getById(String id) {
return aiCompanyMapper.selectById( id);
+ }
+
+ @Override
+ public List<AiCompany> getListById(List<String> ids) {
+ LambdaQueryWrapper<AiCompany> aiCompanyLambdaQueryWrapper = Wrappers.lambdaQuery(AiCompany.class);
+ aiCompanyLambdaQueryWrapper.in(AiCompany::getId, ids);
+ return aiCompanyMapper.selectList(aiCompanyLambdaQueryWrapper);
}
@Override
@@ -89,6 +97,27 @@
LambdaQueryWrapper<AiCompanyWorkflow> query = Wrappers.lambdaQuery(AiCompanyWorkflow.class);
query.orderByDesc(AiCompanyWorkflow::getCreatedTime);
Page<AiCompanyWorkflow> pages = aiCompanyWorkflowMapper.selectPage(page, query);
+
+ List<AiCompanyWorkflow> records = pages.getRecords();
+ if (CollUtil.isNotEmpty( records)){
+ Set<String> collect = records.stream().map(AiCompanyWorkflow::getCompanyId).collect(Collectors.toSet());
+
+
+ Map<String, AiCompany> map = new HashMap<>();
+ if (CollUtil.isNotEmpty( collect)){
+ //set转list
+ List<String> collect1 = new ArrayList<>(collect);
+ List<AiCompany> listById = this.getListById((collect1));
+ map = listById.stream().collect(Collectors.toMap(AiCompany::getId, aiCompany -> aiCompany));
+ }
+
+ for (AiCompanyWorkflow aiCompanyWorkflow : records){
+ if (map.containsKey(aiCompanyWorkflow.getCompanyId())){
+ aiCompanyWorkflow.setCompanyName(map.get(aiCompanyWorkflow.getCompanyId()).getName());
+ }
+ }
+
+ }
return pages;
}
diff --git a/src/main/resources/templates/febs/views/modules/ai/aiCompany/list.html b/src/main/resources/templates/febs/views/modules/ai/aiCompany/list.html
index 123b15e..9bb73e5 100644
--- a/src/main/resources/templates/febs/views/modules/ai/aiCompany/list.html
+++ b/src/main/resources/templates/febs/views/modules/ai/aiCompany/list.html
@@ -134,7 +134,7 @@
{type: 'numbers', title: '', width: 80},
{title: '操作', toolbar: '#aiCompanyOption', minWidth: 200, align: 'center'},
{field: 'id', title: '编码', minWidth: 100,align:'center'},
- {field: 'name', title: '名称', minWidth: 100,align:'center'},
+ {field: 'name', title: '公司', minWidth: 100,align:'center'},
]]
});
}
diff --git a/src/main/resources/templates/febs/views/modules/ai/workflow/list.html b/src/main/resources/templates/febs/views/modules/ai/workflow/list.html
index 119e4ca..842095c 100644
--- a/src/main/resources/templates/febs/views/modules/ai/workflow/list.html
+++ b/src/main/resources/templates/febs/views/modules/ai/workflow/list.html
@@ -151,7 +151,7 @@
{title: '操作', toolbar: '#workflowOption', minWidth: 200, align: 'center'},
{field: 'code', title: '编码', minWidth: 100,align:'center'},
{templet:"#workflowTypeFormat", title: '类型', minWidth: 140,align:'center'},
- {field: 'companyId', title: '公司编码', minWidth: 150,align:'center'},
+ {field: 'companyName', title: '公司', minWidth: 150,align:'center'},
]]
});
}
--
Gitblit v1.9.1