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

fix: heal missing queue rows for inherited departments

Browse Source
This commit is contained in:
Your Name 2026-03-13 09:52:10 +08:00
parent 9fba6b03f4
commit b2287e0fbe
2 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
backend/src/main/java/com/designhub/service/TaskItemService.java
View File

@ -328,9 +328,70 @@ public class TaskItemService {
}
}
List<Long> allowedDeptIds = resolveAllowedQueueDeptIds(item);
if (!allowedDeptIds.isEmpty()) {
if (viewerDeptId != null) {
Long matchedDeptId = null;
int bestDistance = Integer.MAX_VALUE;
for (Long candidateDeptId : allowedDeptIds) {
if (candidateDeptId == null || !isDeptMatchedOrInherited(viewerDeptId, candidateDeptId)) {
continue;
}
int distance = getDeptDistance(viewerDeptId, candidateDeptId);
if (distance < bestDistance) {
bestDistance = distance;
matchedDeptId = candidateDeptId;
}
}
if (matchedDeptId != null) {
return matchedDeptId;
}
}
return allowedDeptIds.get(0);
}
return unlockStatuses.get(0).getDeptId();
}
private List<Long> resolveAllowedQueueDeptIds(TaskItem item) {
if (item == null || item.getTaskTypeId() == null) {
return java.util.Collections.emptyList();
}
com.designhub.entity.DemandType demandType = configService.getDemandTypeById(item.getTaskTypeId());
String allowedDeptIds = null;
if (demandType != null) {
allowedDeptIds = demandType.getAllowedDeptIds();
if ((allowedDeptIds == null || allowedDeptIds.isBlank()) && demandType.getParentId() != null) {
com.designhub.entity.DemandType parentType = configService.getDemandTypeById(demandType.getParentId());
if (parentType != null) {
allowedDeptIds = parentType.getAllowedDeptIds();
}
}
}
if (allowedDeptIds == null || allowedDeptIds.isBlank()) {
return java.util.Collections.emptyList();
}
List<Long> result = new java.util.ArrayList<>();
Set<Long> seen = new java.util.HashSet<>();
for (String deptIdText : allowedDeptIds.split(",")) {
if (deptIdText == null || deptIdText.isBlank()) {
continue;
}
try {
Long deptId = Long.parseLong(deptIdText.trim());
if (seen.add(deptId)) {
result.add(deptId);
}
} catch (NumberFormatException e) {
log.warn("解析排队部门ID失败: taskItemId={}, deptIdText={}", item.getId(), deptIdText);
}
}
return result;
}
private int getDeptDistance(Long userDeptId, Long targetDeptId) {
if (userDeptId == null || targetDeptId == null) {
return Integer.MAX_VALUE;

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

@ -550,8 +550,8 @@ public class TaskUnlockService {
if (isUnlocked == null) {
// 没有记录：补全排队记录，避免“新任务绕过排队”
LocalDate publishDate = item.getCreateTime() != null ? item.getCreateTime().toLocalDate() : LocalDate.now();
unlockStatusMapper.insertIfNotExists(item.getId(), deptId, publishDate, 0);
ensureUnlockStatusExists(taskItemId(item), deptId);
tryTopUpDeptQueue(deptId);
isUnlocked = unlockStatusMapper.isUnlocked(item.getId(), deptId);
// 兜底：依然查不到则按排队中处理
@ -624,9 +624,11 @@ public class TaskUnlockService {
Integer isUnlocked = unlockStatusMapper.isUnlocked(taskItemId, deptId);
if (isUnlocked == null) {
// 没有记录：补全排队记录，默认排队中（不可抢）
// 没有记录：补全排队记录，并尝试按部门阈值补位
ensureUnlockStatusExists(taskItemId, deptId);
return false;
tryTopUpDeptQueue(deptId);
isUnlocked = unlockStatusMapper.isUnlocked(taskItemId, deptId);
return isUnlocked != null && isUnlocked == 1;
}
return isUnlocked == 1;
@ -666,6 +668,21 @@ public class TaskUnlockService {
}
}
private void tryTopUpDeptQueue(Long deptId) {
if (deptId == null || !isUnlockEnabled()) {
return;
}
try {
unlockTasksForDept(deptId, getDailyUnlockMin());
} catch (Exception e) {
log.warn("补齐部门可接任务失败: deptId={}, error={}", deptId, e.getMessage());
}
}
private Long taskItemId(TaskItem item) {
return item == null ? null : item.getId();
}
/**
* 获取任务的目标接单部门ID列表（支持多部门 & 三级分类继承）
*/