lunanting/qiangdanxitong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 一级需求部门排名表格增加一级部门和二级部门名称列

Browse Source
This commit is contained in:
Your Name 2026-01-21 20:45:27 +08:00
parent 0afea4aa08
commit 98c393ed2e
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/src/main/java/com/designhub/service/AnalyticsService.java
View File

@ -2479,10 +2479,33 @@ public class AnalyticsService {
PrimaryDeptRankingVO vo = new PrimaryDeptRankingVO();
vo.setDeptId(deptId);
// 获取部门名称
// 获取部门名称和上级部门名称
Department dept = departmentMapper.selectById(deptId);
vo.setDeptName(dept != null ? dept.getDeptName() : "未知部门");
// 获取一级部门和二级部门名称
if (dept != null) {
// 向上查找部门层级
List<Department> hierarchy = new java.util.ArrayList<>();
Department current = dept;
while (current != null && current.getParentId() != null && current.getParentId() > 0) {
Department parent = departmentMapper.selectById(current.getParentId());
if (parent != null) {
hierarchy.add(0, parent); // 插入到列表开头
}
current = parent;
}
// hierarchy 现在从根部门到当前部门的父部门
// 一级部门是 hierarchy[0]，二级部门是 hierarchy[1]（如果存在）
if (hierarchy.size() >= 1) {
vo.setFirstLevelDeptName(hierarchy.get(0).getDeptName());
}
if (hierarchy.size() >= 2) {
vo.setSecondLevelDeptName(hierarchy.get(1).getDeptName());
}
}
vo.setTaskCount(deptTasks.size());
// 计算审核通过率

18
backend/src/main/java/com/designhub/vo/PrimaryDeptRankingVO.java
View File

@ -18,10 +18,20 @@ public class PrimaryDeptRankingVO {
private Long deptId;
/**
* 部门名称
* 部门名称（三级/四级部门）
*/
private String deptName;
/**
* 一级部门名称
*/
private String firstLevelDeptName;
/**
* 二级部门名称
*/
private String secondLevelDeptName;
/**
* 发起任务数
*/
@ -63,6 +73,12 @@ public class PrimaryDeptRankingVO {
public String getDeptName() { return deptName; }
public void setDeptName(String deptName) { this.deptName = deptName; }
public String getFirstLevelDeptName() { return firstLevelDeptName; }
public void setFirstLevelDeptName(String firstLevelDeptName) { this.firstLevelDeptName = firstLevelDeptName; }
public String getSecondLevelDeptName() { return secondLevelDeptName; }
public void setSecondLevelDeptName(String secondLevelDeptName) { this.secondLevelDeptName = secondLevelDeptName; }
public Integer getTaskCount() { return taskCount; }
public void setTaskCount(Integer taskCount) { this.taskCount = taskCount; }

2
frontend/src/views/Analytics.vue
View File

@ -1132,6 +1132,8 @@ const platformColumns = [
const primaryDeptColumns = [
{ title: '排名', key: 'rank', dataIndex: 'rank', align: 'center', width: 60 },
{ title: '部门名称', dataIndex: 'deptName', key: 'deptName', ellipsis: true },
{ title: '一级部门', dataIndex: 'firstLevelDeptName', key: 'firstLevelDeptName', ellipsis: true, width: 120 },
{ title: '二级部门', dataIndex: 'secondLevelDeptName', key: 'secondLevelDeptName', ellipsis: true, width: 120 },
{ title: '发起任务数', dataIndex: 'taskCount', key: 'taskCount', align: 'center', width: 100 },
{ title: '审核通过率', key: 'approvalRate', align: 'center', width: 100 },
{ title: '消耗积分', key: 'consumedScore', align: 'center', width: 100 },