fix: 1.SPU号支持横杠字符 2.部门管理默认折叠树形结构

This commit is contained in:
Your Name 2026-01-09 12:24:20 +08:00
parent aa94b53a39
commit 863f1ba18e
3 changed files with 19 additions and 19 deletions

View File

@ -484,7 +484,7 @@ public class TaskService {
item.setEstimatedHours(groupTotalHours);
item.setSortOrder(itemIndex);
item.setProgress(0);
// 如果是assigned模式,设置子任务的接收人(从该组的第一个任务项获取)
if ("assigned".equals(dto.getReleaseType()) && !groupItems.isEmpty()) {
Long itemReceiverId = groupItems.get(0).getReceiverId();
@ -1990,17 +1990,17 @@ public class TaskService {
log.debug("接单部门积分统计: deptIds={}, totalScore={}", deptAndChildIds, totalScore);
} else {
// 个人视角:统计当前用户获得的积分
LambdaQueryWrapper<Task> scoreQuery = new LambdaQueryWrapper<Task>()
.eq(Task::getStatus, "completed")
.select(Task::getScoreReward);
if (!isAdmin) {
scoreQuery.eq(Task::getReceiverId, userId);
}
List<Task> completedTasks = taskMapper.selectList(scoreQuery);
LambdaQueryWrapper<Task> scoreQuery = new LambdaQueryWrapper<Task>()
.eq(Task::getStatus, "completed")
.select(Task::getScoreReward);
if (!isAdmin) {
scoreQuery.eq(Task::getReceiverId, userId);
}
List<Task> completedTasks = taskMapper.selectList(scoreQuery);
totalScore = completedTasks.stream()
.filter(t -> t.getScoreReward() != null)
.mapToInt(t -> t.getScoreReward().intValue())
.sum();
.filter(t -> t.getScoreReward() != null)
.mapToInt(t -> t.getScoreReward().intValue())
.sum();
}
// 获取当月发布的任务数
@ -2022,9 +2022,9 @@ public class TaskService {
} else {
// 当前用户发布的任务数
publishedCount = taskMapper.selectCount(new LambdaQueryWrapper<Task>()
.eq(Task::getPublisherId, userId)
.ge(Task::getCreateTime, monthStart)
.le(Task::getCreateTime, monthEnd)
.eq(Task::getPublisherId, userId)
.ge(Task::getCreateTime, monthStart)
.le(Task::getCreateTime, monthEnd)
.eq(Task::getDeleted, 0));
}

View File

@ -373,7 +373,7 @@
<a-form-item label="SPU信息" name="spuInfo">
<a-input
v-model:value="formData.spuInfo"
placeholder="请输入SPU编号(仅支持大写字母和数字)"
placeholder="请输入SPU编号(支持大写字母、数字和横杠)"
size="large"
@input="handleSpuInput"
/>
@ -897,11 +897,11 @@ const removeTaskType = (index: number) => {
}
}
// 处理SPU输入(只允许大写字母和数字)
// 处理SPU输入(只允许大写字母、数字和横杠)
const handleSpuInput = (e: Event) => {
const input = e.target as HTMLInputElement
// 移除非大写字母和数字的字符,同时将小写字母转为大写
const filtered = input.value.toUpperCase().replace(/[^A-Z0-9]/g, '')
// 移除非大写字母、数字和横杠的字符,同时将小写字母转为大写
const filtered = input.value.toUpperCase().replace(/[^A-Z0-9\-]/g, '')
formData.spuInfo = filtered
}

View File

@ -523,7 +523,7 @@
:loading="loading.departments"
row-key="id"
:pagination="false"
:default-expand-all-rows="true"
:default-expand-all-rows="false"
:indent-size="24"
>
<template #bodyCell="{ column, record }">