[audit] P6.1 F11-4 台账路由挂起可观测:pageAdmin 增 hung 过滤 + 行级 routeHung 红标(口径=max attempt 路由行 outlet 仍 NULL,防误报)
This commit is contained in:
@@ -54,6 +54,7 @@ public class FlowAdminController {
|
||||
private final com.fasterxml.jackson.databind.ObjectMapper objectMapper;
|
||||
private final com.yunhai.flowcenter.service.FlowAppAdminService appAdminService;
|
||||
private final com.yunhai.flowcenter.service.FlowDeptAdminService deptAdminService;
|
||||
private final com.yunhai.flowcenter.repository.FlwRouteLogRepository routeLogRepository;
|
||||
|
||||
// ==================== 流程定义 ====================
|
||||
|
||||
@@ -462,18 +463,34 @@ public class FlowAdminController {
|
||||
|
||||
// ==================== 办件查询 ====================
|
||||
|
||||
/**
|
||||
* 管理端办件分页(F11-4 增 hung 筛选与行级红标):hung=true 只看路由挂起办件
|
||||
* (口径见 {@link com.yunhai.flowcenter.repository.FlwInstanceRepository#pageAdmin});
|
||||
* 每行回填 {@code routeHung}(按页一次 {@code findHungInstanceIds} 查询,非逐行 N+1)。
|
||||
*/
|
||||
@GetMapping("/instance/page")
|
||||
public BasePageResult<FlwInstance> instancePage(
|
||||
BoaUser user,
|
||||
@RequestParam(value = "status", required = false) Integer status,
|
||||
@RequestParam(value = "keyword", required = false) String keyword,
|
||||
@RequestParam(value = "hung", required = false) Boolean hung,
|
||||
@RequestParam(value = "page", required = false) Integer page,
|
||||
@RequestParam(value = "size", required = false) Integer size) {
|
||||
Long schId = adminGuard.requireAdmin(user, null);
|
||||
Page<FlwInstance> p = instanceRepository.pageAdmin(schId, status, keyword,
|
||||
Page<FlwInstance> p = instanceRepository.pageAdmin(schId, status, keyword, hung,
|
||||
PageRequest.of(page == null || page < 1 ? 0 : page - 1,
|
||||
size == null || size < 1 || size > 100 ? 10 : size,
|
||||
Sort.by(Sort.Order.desc("id"))));
|
||||
List<Long> pageIds = new java.util.ArrayList<>();
|
||||
for (FlwInstance i : p.getContent()) {
|
||||
pageIds.add(i.getId());
|
||||
}
|
||||
// 行级红标:不在挂起集合内的行显式置 false(前端只判 truthy,null 也行,但显式更可读)
|
||||
java.util.Set<Long> hungIds = pageIds.isEmpty() ? java.util.Collections.emptySet()
|
||||
: new java.util.HashSet<>(routeLogRepository.findHungInstanceIds(pageIds));
|
||||
for (FlwInstance i : p.getContent()) {
|
||||
i.setRouteHung(hungIds.contains(i.getId()));
|
||||
}
|
||||
int pi = page == null || page < 1 ? 1 : page;
|
||||
int ps = size == null || size < 1 || size > 100 ? 10 : size;
|
||||
return new BasePageResult<>(p.getContent(), (int) p.getTotalElements(), pi, ps,
|
||||
|
||||
Reference in New Issue
Block a user