fix(security): 修复token认证过滤器异步刷新异常处理

- 添加Slf4j注解用于日志记录
- 在load方法中添加try-catch块捕获ServiceException异常
- 当远端token过期或校验失败时返回LOGIN_USER_EMPTY而不是抛出异常
- 记录token校验失败的日志信息避免被Guava包装为ExecutionException
- 防止异步刷新线程将预期的验证异常作为未捕获异常打印到日志中

.claude/settings.local.json

@@ -105,7 +105,11 @@
       "PowerShell($env:JAVA_HOME = 'C:\\\\Program Files\\\\Java\\\\jdk-17'; $env:PATH = \"$env:JAVA_HOME\\\\bin;$env:PATH\"; $out = & 'C:\\\\software\\\\apache-maven-3.8.9\\\\bin\\\\mvn.cmd' -pl rdms-project/rdms-project-boot -am compile -DskipTests 2>&1; $code = $LASTEXITCODE; $out | Select-Object -Last 15; Write-Output \"EXIT=$code\")",
       "Bash(set \"JAVA_HOME=C:\\\\Program Files\\\\Java\\\\jdk-17\")",
       "Bash(\"C:\\\\software\\\\apache-maven-3.8.9\\\\bin\\\\mvn.cmd\" -pl rdms-project/rdms-project-boot -am compile -DskipTests -q)",
-      "Bash(\"C:\\\\software\\\\apache-maven-3.8.9\\\\bin\\\\mvn.cmd\" -pl rdms-project/rdms-project-boot -am compile -DskipTests)"
+      "Bash(\"C:\\\\software\\\\apache-maven-3.8.9\\\\bin\\\\mvn.cmd\" -pl rdms-project/rdms-project-boot -am compile -DskipTests)",
+      "Bash(grep -E \"\\\\.\\(sql|java|md\\)$\")",
+      "Bash(xargs grep -l \"INSERT INTO.*system_menu\")",
+      "Bash(Get-ChildItem *)",
+      "Bash(Select-Object FullName)"
     ]
   }
 }

CLAUDE.md

@@ -9,6 +9,7 @@
 - 描述仓库现状以**当前**代码、配置、文档可验证的事实为准；不要拿历史实现、过渡方案或已废弃模型解释当前状态。
 - **输出极简**：先给结论、改动点、必要风险；用自然语言给判断和影响面，少贴代码片段；涉及代码用 `file_path:line_number` 引用；用户追问再展开。
 - **下定论需要充足证据**。疑似 bug 时先判断是否稳定复现：跑了很久没动过的功能**首次**报错，优先怀疑运行时状态污染（devtools / IDE 热替换、ApplicationContext 残留、缓存、Redis / DB 连接、JVM 静态字段被旧 context 设过等），**不要凭单次堆栈就断言代码 bug，更不要直接甩修改方案**。先给"可能原因 + 最便宜的取证步骤"（多数场景是**冷重启 JVM**），用户确认能稳定复现，再讨论代码层面的修复。同款写法在仓库其它位置存在并不能反推"也是 bug"，长期能跑的代码突然失效 ≠ 代码本身错。
+- **技术风险判断（性能 / N+1 / 索引缺失 / 架构缺陷 / 并发安全 / 内存泄漏 等）与"bug 判断"同等严格**：未读到实现层不下结论。不要凭 subagent 摘要、字段名、注释或印象"顺嘴提一句风险/瓶颈/可能问题"——那也是下结论，**且杀伤力更大**：用户会基于"风险提示"决定要不要立项整改。如果当前上下文没核实到实现，就明说"这部分未核实，需要打开 X 文件确认"，不要把猜测包装成"风险提示"塞出去。已识别教训：执行进度查询答完"已批量聚合无 N+1"后又凭印象抛"列表 N+1 风险"，被追问才收回。
 
 ## 本机环境
 

rdms-gateway/src/main/java/com/njcn/rdms/gateway/filter/security/TokenAuthenticationFilter.java

@@ -14,6 +14,7 @@ import com.njcn.rdms.framework.common.util.json.JsonUtils;
 import com.njcn.rdms.gateway.util.SecurityFrameworkUtils;
 import com.njcn.rdms.gateway.util.WebFrameworkUtils;
 import com.njcn.rdms.module.system.enums.ErrorCodeConstants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.client.loadbalancer.reactive.ReactorLoadBalancerExchangeFilterFunction;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -30,6 +31,7 @@ import java.util.function.Function;
 
 import static com.njcn.rdms.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
 
+@Slf4j
 @Component
 public class TokenAuthenticationFilter implements GlobalFilter, Ordered {
 
@@ -57,8 +59,16 @@ public class TokenAuthenticationFilter implements GlobalFilter, Ordered {
 
                 @Override
                 public LoginUser load(String token) {
-                    String body = checkAccessToken(token).block();
-                    return buildUser(body, token);
+                    // 仅异步 refresh 走这里（同步链路用 getIfPresent + 直接 checkAccessToken，不触发 load）
+                    // 远端 token 已过期/校验失败时吞掉 ServiceException：
+                    // 若抛出，会被 Guava 包成 ExecutionException 并由刷新线程池作为 UncaughtException 打到日志，看起来像故障。
+                    try {
+                        String body = checkAccessToken(token).block();
+                        return buildUser(body, token);
+                    } catch (ServiceException ex) {
+                        log.info("[loginUserCache] 异步刷新忽略 token 校验失败：code={}, msg={}", ex.getCode(), ex.getMessage());
+                        return LOGIN_USER_EMPTY;
+                    }
                 }
 
             });

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/constant/ProjectTaskConstants.java

@@ -59,6 +59,18 @@ public final class ProjectTaskConstants {
      */
     public static final String PERMISSION_DELETE = "project:task:delete";
 
+    /**
+     * 项目任务"查看全部"权限码(对象域,object_type='project')。
+     *
+     * 用于跨执行视角下"项目全部任务"语义的接口/视图(page / status-board /
+     * board-page / summary 的 scope=all 分支)。无此权限码时,只能看到自己作为
+     * owner 或活跃协办的任务(走 VisibilityScopeResolver.resolveForProject 过滤)。
+     *
+     * 种子绑定:默认绑给项目负责人 + 项目创建人;普通成员、执行负责人默认不绑。
+     * 实际项目中由运维在角色管理界面调整。
+     */
+    public static final String PERMISSION_LIST_ALL = "project:task:list-all";
+
     /**
      * 删除确认口令合法值集合；兼容大写英文 "DELETE" 与中文 "删除"，前端可纯中文文案。
      * 校验时精确匹配（trim 后比对）。

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/execution/ProjectExecutionController.java

@@ -1,6 +1,7 @@
 package com.njcn.rdms.module.project.controller.admin.project.execution;
 
 import com.njcn.rdms.framework.common.pojo.CommonResult;
+import com.njcn.rdms.framework.common.pojo.PageParam;
 import com.njcn.rdms.framework.common.pojo.PageResult;
 import com.njcn.rdms.module.project.controller.admin.project.execution.vo.execution.ProjectExecutionOwnerChangeReqVO;
 import com.njcn.rdms.module.project.controller.admin.project.execution.vo.execution.ProjectExecutionPageReqVO;
@@ -65,6 +66,11 @@ public class ProjectExecutionController {
     @Operation(summary = "获取执行分页")
     public CommonResult<PageResult<ProjectExecutionRespVO>> getExecutionPage(@PathVariable("projectId") Long projectId,
                                                                              @Valid ProjectExecutionPageReqVO reqVO) {
+        // 前端用负数 pageSize 表示"查询全部"，统一归一为框架约定的 PAGE_SIZE_NONE(-1)，
+        // 走 BaseMapperX.selectPage 的不分页短路；@Max(200) 仅拦上界，负数不会被 validator 卡。
+        if (reqVO.getPageSize() != null && reqVO.getPageSize() < 0) {
+            reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        }
         return success(projectExecutionService.getExecutionRespVOPage(projectId, reqVO));
     }
 

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/ProjectTaskAggregateController.java

@@ -0,0 +1,66 @@
+package com.njcn.rdms.module.project.controller.admin.project.task;
+
+import com.njcn.rdms.framework.common.pojo.CommonResult;
+import com.njcn.rdms.framework.common.pojo.PageResult;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskBoardPageRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskStatusBoardRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateBoardPageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregatePageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateStatusBoardReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskSummaryReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskSummaryRespVO;
+import com.njcn.rdms.module.project.service.project.task.ProjectTaskAggregateService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static com.njcn.rdms.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 项目级跨执行任务查询")
+@RestController
+@RequestMapping("/project/project/{projectId}/tasks")
+@Validated
+public class ProjectTaskAggregateController {
+
+    @Resource
+    private ProjectTaskAggregateService projectTaskAggregateService;
+
+    @GetMapping("/page")
+    @Operation(summary = "获取项目级跨执行任务分页")
+    public CommonResult<PageResult<ProjectTaskRespVO>> getTaskPage(
+            @PathVariable("projectId") Long projectId,
+            @Valid ProjectTaskAggregatePageReqVO reqVO) {
+        return success(projectTaskAggregateService.getAggregateTaskPage(projectId, reqVO));
+    }
+
+    @GetMapping("/status-board")
+    @Operation(summary = "获取项目级跨执行任务状态看板")
+    public CommonResult<ProjectTaskStatusBoardRespVO> getTaskStatusBoard(
+            @PathVariable("projectId") Long projectId,
+            @Valid ProjectTaskAggregateStatusBoardReqVO reqVO) {
+        return success(projectTaskAggregateService.getAggregateTaskStatusBoard(projectId, reqVO));
+    }
+
+    @GetMapping("/board-page")
+    @Operation(summary = "获取项目级跨执行任务看板分页")
+    public CommonResult<ProjectTaskBoardPageRespVO> getTaskBoardPage(
+            @PathVariable("projectId") Long projectId,
+            @Valid ProjectTaskAggregateBoardPageReqVO reqVO) {
+        return success(projectTaskAggregateService.getAggregateTaskBoardPage(projectId, reqVO));
+    }
+
+    @GetMapping("/summary")
+    @Operation(summary = "获取项目任务今日小条(支持 scope=mine|all)")
+    public CommonResult<ProjectTaskSummaryRespVO> getTaskSummary(
+            @PathVariable("projectId") Long projectId,
+            @Valid ProjectTaskSummaryReqVO reqVO) {
+        return success(projectTaskAggregateService.getAggregateTaskSummary(projectId, reqVO));
+    }
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/vo/ProjectTaskRespVO.java

@@ -21,6 +21,10 @@ public class ProjectTaskRespVO {
     private Long projectId;
     @Schema(description = "所属执行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "5001")
     private Long executionId;
+    @Schema(description = "所属执行名称", example = "迭代 V1.0")
+    private String executionName;
+    @Schema(description = "所属执行状态码")
+    private String executionStatusCode;
     @Schema(description = "所属执行关联的项目需求编号（service 层批量回填）")
     private Long projectRequirementId;
     @Schema(description = "项目需求名称（service 层批量回填，避免 N+1）", example = "前端联调-需求A")

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/vo/aggregate/ProjectTaskAggregateBoardPageReqVO.java

@@ -0,0 +1,51 @@
+package com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate;
+
+import com.njcn.rdms.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.njcn.rdms.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目级跨执行任务看板分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectTaskAggregateBoardPageReqVO extends PageParam {
+
+    @Schema(description = "任务名称模糊匹配关键字")
+    private String keyword;
+
+    @Schema(description = "限定执行 id 列表;不传 = 项目内全部执行")
+    private List<Long> executionIds;
+
+    @Schema(description = "限定任务所属执行的状态码多选;空数组 = 明确返空;不传 = 不按执行状态过滤")
+    private List<String> executionStatusCodes;
+
+    @Schema(description = "我参与语义;与 ownerId 二选一")
+    private Long involveUserId;
+
+    @Schema(description = "仅作为 owner 匹配;与 involveUserId 二选一")
+    private Long ownerId;
+
+    @Schema(description = "限定状态列(板上显示哪些列);空 / 不传 = 字典全状态")
+    private List<String> statusCodes;
+
+    @Schema(description = "优先级")
+    @Size(max = 8)
+    private String priority;
+
+    @Schema(description = "父任务 id")
+    private Long parentTaskId;
+
+    @Schema(description = "到期范围 chip:overdue / today / thisWeek")
+    private String dueRange;
+
+    @Schema(description = "更新时间范围")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] updateTime;
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/vo/aggregate/ProjectTaskAggregatePageReqVO.java

@@ -0,0 +1,57 @@
+package com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate;
+
+import com.njcn.rdms.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.njcn.rdms.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目级跨执行任务分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectTaskAggregatePageReqVO extends PageParam {
+
+    @Schema(description = "任务名称模糊匹配关键字")
+    private String keyword;
+
+    @Schema(description = "限定执行 id 列表;不传 = 项目内全部执行")
+    private List<Long> executionIds;
+
+    @Schema(description = "限定任务所属执行的状态码多选;空数组 = 明确返空;不传 = 不按执行状态过滤")
+    private List<String> executionStatusCodes;
+
+    @Schema(description = "我参与语义:该 userId 是 owner 或活跃协办;与 ownerId 二选一")
+    private Long involveUserId;
+
+    @Schema(description = "仅作为 owner 匹配(不含协办);与 involveUserId 二选一")
+    private Long ownerId;
+
+    @Schema(description = "状态码多选;空 / 不传 = 全部")
+    private List<String> statusCodes;
+
+    @Schema(description = "优先级字典 value (0~3)")
+    @Size(max = 8)
+    private String priority;
+
+    @Schema(description = "父任务 id(限定到某父任务下)")
+    private Long parentTaskId;
+
+    @Schema(description = "到期范围 chip:overdue / today / thisWeek")
+    private String dueRange;
+
+    @Schema(description = "更新时间范围(2 长度数组)")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] updateTime;
+
+    @Schema(description = "排序字段:plannedEndDate / priority / updateTime / createTime(默认 plannedEndDate)")
+    private String sortBy;
+
+    @Schema(description = "排序方向:asc / desc(默认 asc)")
+    private String sortOrder;
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/vo/aggregate/ProjectTaskAggregateStatusBoardReqVO.java

@@ -0,0 +1,45 @@
+package com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.njcn.rdms.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 项目级跨执行任务状态看板 Request VO(入参同 page 去掉分页 / statusCodes / sort)")
+@Data
+public class ProjectTaskAggregateStatusBoardReqVO {
+
+    @Schema(description = "任务名称模糊匹配关键字")
+    private String keyword;
+
+    @Schema(description = "限定执行 id 列表;不传 = 项目内全部执行")
+    private List<Long> executionIds;
+
+    @Schema(description = "限定任务所属执行的状态码多选;空数组 = 明确返空;不传 = 不按执行状态过滤")
+    private List<String> executionStatusCodes;
+
+    @Schema(description = "我参与语义;与 ownerId 二选一")
+    private Long involveUserId;
+
+    @Schema(description = "仅作为 owner 匹配;与 involveUserId 二选一")
+    private Long ownerId;
+
+    @Schema(description = "优先级")
+    @Size(max = 8)
+    private String priority;
+
+    @Schema(description = "父任务 id")
+    private Long parentTaskId;
+
+    @Schema(description = "到期范围 chip:overdue / today / thisWeek")
+    private String dueRange;
+
+    @Schema(description = "更新时间范围")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] updateTime;
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/vo/aggregate/ProjectTaskSummaryReqVO.java

@@ -0,0 +1,19 @@
+package com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 项目任务今日小条 Request VO")
+@Data
+public class ProjectTaskSummaryReqVO {
+
+    /**
+     * 数字汇总作用域。
+     * <ul>
+     *   <li>{@code mine}(默认):统计当前登录人 owner 或活跃协办的任务</li>
+     *   <li>{@code all}:统计项目内全部任务,要求 {@code project:task:list-all} 权限码</li>
+     * </ul>
+     */
+    @Schema(description = "作用域:mine(默认) / all", example = "mine")
+    private String scope;
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/task/vo/aggregate/ProjectTaskSummaryRespVO.java

@@ -0,0 +1,32 @@
+package com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Schema(description = "管理后台 - 项目任务今日小条 Response VO")
+@Data
+public class ProjectTaskSummaryRespVO {
+
+    @Schema(description = "逾期任务数:计划完成日 < 今天,且任务状态非终态")
+    private Long overdue;
+
+    @Schema(description = "今日截止任务数:计划完成日 = 今天,且任务状态非终态")
+    private Long dueToday;
+
+    @Schema(description = "本周到期任务数:计划完成日 ∈ [本周一, 本周日],且任务状态非终态(与 chip thisWeek 过滤同口径)")
+    private Long dueThisWeek;
+
+    @Schema(description = "本周已完成任务数:actualEndDate ∈ [本周一, 今天],且任务状态 = completed")
+    private Long doneThisWeek;
+
+    @Schema(description = "服务器当日(YYYY-MM-DD,Asia/Shanghai)", example = "2026-05-22")
+    private LocalDate today;
+
+    @Schema(description = "服务器本周一(YYYY-MM-DD,Asia/Shanghai)", example = "2026-05-18")
+    private LocalDate weekStart;
+
+    @Schema(description = "服务器本周日(YYYY-MM-DD,Asia/Shanghai)", example = "2026-05-24")
+    private LocalDate weekEnd;
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/mysql/project/ProjectMapper.java

@@ -73,4 +73,14 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
                 .eq(ProjectDO::getStatusCode, statusCode));
     }
 
+    /**
+     * 仅更新项目 progressRate，不动其他字段（避免污染 lastStatusReason 等）。
+     */
+    default int updateProgressRateById(Long id, java.math.BigDecimal progressRate) {
+        ProjectDO update = new ProjectDO();
+        update.setProgressRate(progressRate);
+        return update(update, new LambdaQueryWrapperX<ProjectDO>()
+                .eq(ProjectDO::getId, id));
+    }
+
 }

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/mysql/project/task/ProjectTaskMapper.java

@@ -1,13 +1,18 @@
 package com.njcn.rdms.module.project.dal.mysql.project.task;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.rdms.framework.common.pojo.PageResult;
 import com.njcn.rdms.framework.mybatis.core.dataobject.BaseDO;
 import com.njcn.rdms.framework.mybatis.core.mapper.BaseMapperX;
 import com.njcn.rdms.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskStatusBoardReqVO;
 import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskPageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregatePageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateStatusBoardReqVO;
 import com.njcn.rdms.module.project.dal.dataobject.project.task.ProjectTaskDO;
 import com.njcn.rdms.module.project.service.project.permission.VisibilityScope;
+import lombok.Data;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -186,6 +191,26 @@ public interface ProjectTaskMapper extends BaseMapperX<ProjectTaskDO> {
             @Param("executionIds") Collection<Long> executionIds,
             @Param("excludedStatusCodes") Collection<String> excludedStatusCodes);
 
+    /**
+     * 项目进度推算：跨执行聚合，按项目下所有根任务 progressRate 简单平均；无根任务时 SQL 返回 null。
+     * 与执行口径一致（parent_task_id IS NULL + excludedStatusCodes），区别仅是不限定 execution_id。
+     */
+    @Select("""
+            <script>
+            SELECT AVG(COALESCE(progress_rate, 0))
+            FROM rdms_task
+            WHERE deleted = b'0'
+              AND project_id = #{projectId}
+              AND parent_task_id IS NULL
+              <if test="excludedStatusCodes != null and excludedStatusCodes.size() > 0">
+              AND status_code NOT IN
+                <foreach collection="excludedStatusCodes" item="statusCode" open="(" separator="," close=")">#{statusCode}</foreach>
+              </if>
+            </script>
+            """)
+    BigDecimal selectRootTaskAvgProgressByProjectId(@Param("projectId") Long projectId,
+                                                    @Param("excludedStatusCodes") Collection<String> excludedStatusCodes);
+
     /**
      * 执行详情完成态聚合：返回根任务总数与"已完成"数，用于 execution complete 按钮判定。
      * 与 selectRootTaskAvgProgressByExecutionId 共用同一根任务筛选口径（execution_id + parent_task_id IS NULL + excludedStatusCodes）。
@@ -379,4 +404,276 @@ public interface ProjectTaskMapper extends BaseMapperX<ProjectTaskDO> {
                 .eq(ProjectTaskDO::getExecutionId, executionId)));
     }
 
+    // ======================== 项目级跨执行聚合查询 ========================
+
+    /**
+     * 项目级跨执行任务分页查询。
+     *
+     * 语义:
+     * - scope.seesAll() = true → 不附加 taskIds 过滤
+     * - scope.seesAll() = false → 附加 t.id IN (scope.taskIds()) 短路过滤
+     * - involveUserId 不为 null → 附加 (t.owner_id = ? OR exists active assignee user_id = ?)
+     * - statusCodes 非空 → t.status_code IN (...)
+     * - dueRange='overdue' 且 terminalStatusCodes 非空 → 排除终态
+     */
+    @Select("""
+            <script>
+            SELECT t.*
+            FROM rdms_task t
+            <where>
+                t.project_id = #{projectId}
+                AND t.deleted = b'0'
+                <if test="!seesAll and visibleTaskIds != null and !visibleTaskIds.isEmpty()">
+                    AND t.id IN
+                    <foreach collection="visibleTaskIds" item="tid" open="(" separator="," close=")">#{tid}</foreach>
+                </if>
+                <if test="!seesAll and (visibleTaskIds == null or visibleTaskIds.isEmpty())">
+                    AND 1=0
+                </if>
+                <if test="reqVO.keyword != null and reqVO.keyword != ''">
+                    AND t.task_title LIKE CONCAT('%', #{reqVO.keyword}, '%')
+                </if>
+                <if test="reqVO.executionIds != null and !reqVO.executionIds.isEmpty()">
+                    AND t.execution_id IN
+                    <foreach collection="reqVO.executionIds" item="eid" open="(" separator="," close=")">#{eid}</foreach>
+                </if>
+                <if test="reqVO.executionStatusCodes != null and !reqVO.executionStatusCodes.isEmpty()">
+                    AND EXISTS (
+                        SELECT 1 FROM rdms_project_execution e
+                        WHERE e.id = t.execution_id
+                          AND e.deleted = b'0'
+                          AND e.status_code IN
+                          <foreach collection="reqVO.executionStatusCodes" item="esc" open="(" separator="," close=")">#{esc}</foreach>
+                    )
+                </if>
+                <if test="reqVO.involveUserId != null">
+                    AND (
+                        t.owner_id = #{reqVO.involveUserId}
+                        OR EXISTS (
+                            SELECT 1 FROM rdms_task_assignee a
+                            WHERE a.task_id = t.id
+                              AND a.user_id = #{reqVO.involveUserId}
+                              AND a.removed_at IS NULL
+                              AND a.deleted = b'0'
+                        )
+                    )
+                </if>
+                <if test="reqVO.ownerId != null">
+                    AND t.owner_id = #{reqVO.ownerId}
+                </if>
+                <if test="reqVO.statusCodes != null and !reqVO.statusCodes.isEmpty()">
+                    AND t.status_code IN
+                    <foreach collection="reqVO.statusCodes" item="sc" open="(" separator="," close=")">#{sc}</foreach>
+                </if>
+                <if test="reqVO.priority != null and reqVO.priority != ''">
+                    AND t.priority = #{reqVO.priority}
+                </if>
+                <if test="reqVO.parentTaskId != null">
+                    AND t.parent_task_id = #{reqVO.parentTaskId}
+                </if>
+                <if test="reqVO.dueRange == 'overdue'">
+                    AND t.planned_end_date &lt; #{today}
+                    <if test="terminalStatusCodes != null and !terminalStatusCodes.isEmpty()">
+                        AND t.status_code NOT IN
+                        <foreach collection="terminalStatusCodes" item="tc" open="(" separator="," close=")">#{tc}</foreach>
+                    </if>
+                </if>
+                <if test="reqVO.dueRange == 'today'">
+                    AND t.planned_end_date = #{today}
+                </if>
+                <if test="reqVO.dueRange == 'thisWeek'">
+                    AND t.planned_end_date BETWEEN #{weekStart} AND #{weekEnd}
+                </if>
+                <if test="reqVO.updateTime != null and reqVO.updateTime.length == 2">
+                    AND t.update_time BETWEEN #{reqVO.updateTime[0]} AND #{reqVO.updateTime[1]}
+                </if>
+            </where>
+            <choose>
+                <when test="reqVO.sortBy == 'priority'">ORDER BY t.priority</when>
+                <when test="reqVO.sortBy == 'updateTime'">ORDER BY t.update_time</when>
+                <when test="reqVO.sortBy == 'createTime'">ORDER BY t.create_time</when>
+                <otherwise>ORDER BY t.planned_end_date</otherwise>
+            </choose>
+            <choose>
+                <when test="reqVO.sortOrder == 'desc'">DESC</when>
+                <otherwise>ASC</otherwise>
+            </choose>
+            , t.id DESC
+            </script>
+            """)
+    IPage<ProjectTaskDO> selectAggregatePageByProjectId(
+            @Param("projectId") Long projectId,
+            @Param("seesAll") boolean seesAll,
+            @Param("visibleTaskIds") java.util.Collection<Long> visibleTaskIds,
+            @Param("reqVO") ProjectTaskAggregatePageReqVO reqVO,
+            @Param("terminalStatusCodes") Collection<String> terminalStatusCodes,
+            @Param("weekStart") LocalDate weekStart,
+            @Param("weekEnd") LocalDate weekEnd,
+            @Param("today") LocalDate today,
+            Page<ProjectTaskDO> page);
+
+    /**
+     * 项目级跨执行任务按状态分组计数(status-board)。
+     * 入参同 page 但去除分页 / sort / statusCodes 筛选。
+     */
+    @Select("""
+            <script>
+            SELECT t.status_code AS statusCode, COUNT(*) AS count
+            FROM rdms_task t
+            <where>
+                t.project_id = #{projectId}
+                AND t.deleted = b'0'
+                <if test="!seesAll and visibleTaskIds != null and !visibleTaskIds.isEmpty()">
+                    AND t.id IN
+                    <foreach collection="visibleTaskIds" item="tid" open="(" separator="," close=")">#{tid}</foreach>
+                </if>
+                <if test="!seesAll and (visibleTaskIds == null or visibleTaskIds.isEmpty())">
+                    AND 1=0
+                </if>
+                <if test="reqVO.keyword != null and reqVO.keyword != ''">
+                    AND t.task_title LIKE CONCAT('%', #{reqVO.keyword}, '%')
+                </if>
+                <if test="reqVO.executionIds != null and !reqVO.executionIds.isEmpty()">
+                    AND t.execution_id IN
+                    <foreach collection="reqVO.executionIds" item="eid" open="(" separator="," close=")">#{eid}</foreach>
+                </if>
+                <if test="reqVO.executionStatusCodes != null and !reqVO.executionStatusCodes.isEmpty()">
+                    AND EXISTS (
+                        SELECT 1 FROM rdms_project_execution e
+                        WHERE e.id = t.execution_id
+                          AND e.deleted = b'0'
+                          AND e.status_code IN
+                          <foreach collection="reqVO.executionStatusCodes" item="esc" open="(" separator="," close=")">#{esc}</foreach>
+                    )
+                </if>
+                <if test="reqVO.involveUserId != null">
+                    AND (
+                        t.owner_id = #{reqVO.involveUserId}
+                        OR EXISTS (
+                            SELECT 1 FROM rdms_task_assignee a
+                            WHERE a.task_id = t.id
+                              AND a.user_id = #{reqVO.involveUserId}
+                              AND a.removed_at IS NULL
+                              AND a.deleted = b'0'
+                        )
+                    )
+                </if>
+                <if test="reqVO.ownerId != null">
+                    AND t.owner_id = #{reqVO.ownerId}
+                </if>
+                <if test="reqVO.priority != null and reqVO.priority != ''">
+                    AND t.priority = #{reqVO.priority}
+                </if>
+                <if test="reqVO.parentTaskId != null">
+                    AND t.parent_task_id = #{reqVO.parentTaskId}
+                </if>
+                <if test="reqVO.dueRange == 'overdue'">
+                    AND t.planned_end_date &lt; #{today}
+                    <if test="terminalStatusCodes != null and !terminalStatusCodes.isEmpty()">
+                        AND t.status_code NOT IN
+                        <foreach collection="terminalStatusCodes" item="tc" open="(" separator="," close=")">#{tc}</foreach>
+                    </if>
+                </if>
+                <if test="reqVO.dueRange == 'today'">
+                    AND t.planned_end_date = #{today}
+                </if>
+                <if test="reqVO.dueRange == 'thisWeek'">
+                    AND t.planned_end_date BETWEEN #{weekStart} AND #{weekEnd}
+                </if>
+                <if test="reqVO.updateTime != null and reqVO.updateTime.length == 2">
+                    AND t.update_time BETWEEN #{reqVO.updateTime[0]} AND #{reqVO.updateTime[1]}
+                </if>
+            </where>
+            GROUP BY t.status_code
+            </script>
+            """)
+    List<StatusCountRow> selectAggregateStatusCount(
+            @Param("projectId") Long projectId,
+            @Param("seesAll") boolean seesAll,
+            @Param("visibleTaskIds") java.util.Collection<Long> visibleTaskIds,
+            @Param("reqVO") ProjectTaskAggregateStatusBoardReqVO reqVO,
+            @Param("terminalStatusCodes") Collection<String> terminalStatusCodes,
+            @Param("weekStart") LocalDate weekStart,
+            @Param("weekEnd") LocalDate weekEnd,
+            @Param("today") LocalDate today);
+
+    /**
+     * summary 的 4 个数字一次查出来,避免 4 次扫表。
+     *
+     * 返回 Map 结构:
+     *   overdue → Long
+     *   dueToday → Long
+     *   dueThisWeek → Long
+     *   doneThisWeek → Long
+     */
+    @Select("""
+            <script>
+            SELECT
+                CAST(SUM(CASE WHEN t.planned_end_date &lt; #{today}
+                    <if test="terminalStatusCodes != null and !terminalStatusCodes.isEmpty()">
+                        AND t.status_code NOT IN
+                        <foreach collection="terminalStatusCodes" item="tc" open="(" separator="," close=")">#{tc}</foreach>
+                    </if>
+                    THEN 1 ELSE 0 END) AS SIGNED) AS overdue,
+                CAST(SUM(CASE WHEN t.planned_end_date = #{today}
+                    <if test="terminalStatusCodes != null and !terminalStatusCodes.isEmpty()">
+                        AND t.status_code NOT IN
+                        <foreach collection="terminalStatusCodes" item="tc" open="(" separator="," close=")">#{tc}</foreach>
+                    </if>
+                    THEN 1 ELSE 0 END) AS SIGNED) AS dueToday,
+                CAST(SUM(CASE WHEN t.planned_end_date BETWEEN #{weekStart} AND #{weekEnd}
+                    <if test="terminalStatusCodes != null and !terminalStatusCodes.isEmpty()">
+                        AND t.status_code NOT IN
+                        <foreach collection="terminalStatusCodes" item="tc" open="(" separator="," close=")">#{tc}</foreach>
+                    </if>
+                    THEN 1 ELSE 0 END) AS SIGNED) AS dueThisWeek,
+                CAST(SUM(CASE WHEN t.actual_end_date BETWEEN #{weekStart} AND #{today}
+                    AND t.status_code = #{completedStatusCode}
+                    THEN 1 ELSE 0 END) AS SIGNED) AS doneThisWeek
+            FROM rdms_task t
+            <where>
+                t.project_id = #{projectId}
+                AND t.deleted = b'0'
+                <if test="!seesAll and visibleTaskIds != null and !visibleTaskIds.isEmpty()">
+                    AND t.id IN
+                    <foreach collection="visibleTaskIds" item="tid" open="(" separator="," close=")">#{tid}</foreach>
+                </if>
+                <if test="!seesAll and (visibleTaskIds == null or visibleTaskIds.isEmpty())">
+                    AND 1=0
+                </if>
+                <if test="involveUserId != null">
+                    AND (
+                        t.owner_id = #{involveUserId}
+                        OR EXISTS (
+                            SELECT 1 FROM rdms_task_assignee a
+                            WHERE a.task_id = t.id
+                              AND a.user_id = #{involveUserId}
+                              AND a.removed_at IS NULL
+                              AND a.deleted = b'0'
+                        )
+                    )
+                </if>
+            </where>
+            </script>
+            """)
+    Map<String, Long> selectAggregateSummaryCounts(
+            @Param("projectId") Long projectId,
+            @Param("seesAll") boolean seesAll,
+            @Param("visibleTaskIds") java.util.Collection<Long> visibleTaskIds,
+            @Param("involveUserId") Long involveUserId,
+            @Param("terminalStatusCodes") Collection<String> terminalStatusCodes,
+            @Param("completedStatusCode") String completedStatusCode,
+            @Param("today") LocalDate today,
+            @Param("weekStart") LocalDate weekStart,
+            @Param("weekEnd") LocalDate weekEnd);
+
+    /**
+     * status-board 计数行 — 内嵌静态类,与 mapper 共享生命周期。
+     */
+    @Data
+    class StatusCountRow {
+        private String statusCode;
+        private Long count;
+    }
+
 }

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/enums/DueRangeEnum.java

@@ -0,0 +1,36 @@
+package com.njcn.rdms.module.project.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 任务到期范围快速筛选枚举(用于跨执行任务查询 chip)。
+ *
+ * <p>含义:</p>
+ * <ul>
+ *   <li>{@link #OVERDUE} 计划完成日 &lt; 今天,且任务状态非终态</li>
+ *   <li>{@link #TODAY}   计划完成日 = 今天</li>
+ *   <li>{@link #THIS_WEEK} 计划完成日 在本周(周一~周日,Asia/Shanghai)</li>
+ * </ul>
+ *
+ * <p>非终态的判定走 {@code ObjectStatusModelMapper.selectTerminalStatusCodesByObjectTypeEnabled('task')}
+ * 动态查询,不在此枚举里硬编码状态字面值。</p>
+ */
+@Getter
+@AllArgsConstructor
+public enum DueRangeEnum {
+
+    OVERDUE("overdue"),
+    TODAY("today"),
+    THIS_WEEK("thisWeek");
+
+    private final String value;
+
+    public static DueRangeEnum of(String value) {
+        if (value == null) return null;
+        for (DueRangeEnum e : values()) {
+            if (e.value.equals(value)) return e;
+        }
+        return null;
+    }
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/framework/security/service/ObjectPermissionService.java

@@ -19,4 +19,16 @@ public interface ObjectPermissionService {
      */
     void checkPermission(Long objectId, String permission, boolean memberOnly);
 
+    /**
+     * 判断当前登录用户是否具备指定对象上的指定权限码（非抛模式）。
+     *
+     * 与 {@link #checkPermission(Long, String, boolean)} 区别：
+     * 本方法不抛异常，纯返回 boolean，用于"无权限就走降级路径"而非"无权限就 403"的场景。
+     *
+     * @param objectId   对象 ID（如 projectId）
+     * @param permission 权限码，如 {@code project:task:list-all}
+     * @return true=具备，false=不具备
+     */
+    boolean hasPermission(Long objectId, String permission);
+
 }

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/framework/security/service/ProductObjectPermissionService.java

@@ -8,6 +8,7 @@ import com.njcn.rdms.module.project.dal.mysql.member.UserObjectRoleMapper;
 import com.njcn.rdms.module.project.enums.ErrorCodeConstants;
 import com.njcn.rdms.module.system.api.permission.ObjectPermissionApi;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -23,6 +24,7 @@ import static com.njcn.rdms.framework.common.exception.util.ServiceExceptionUtil
 /**
  * 产品对象权限服务。
  */
+@Slf4j
 @Service
 public class ProductObjectPermissionService implements ObjectPermissionService {
 
@@ -36,6 +38,15 @@ public class ProductObjectPermissionService implements ObjectPermissionService {
         return ProductObjectConstants.OBJECT_TYPE;
     }
 
+    @Override
+    public boolean hasPermission(Long objectId, String permission) {
+        // 当前产品域无 hasPermission 非抛模式调用场景，预留空实现。
+        // 启用时参考 ProjectObjectPermissionService.hasPermission 同款实现。
+        log.warn("[ProductObjectPermissionService.hasPermission] 未实现,默认返回 false;objectId={}, permission={}",
+                objectId, permission);
+        return false;
+    }
+
     @Override
     public void checkPermission(Long objectId, String permission, boolean memberOnly) {
         if (objectId == null) {

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/framework/security/service/ProjectObjectPermissionService.java

@@ -1,5 +1,6 @@
 package com.njcn.rdms.module.project.framework.security.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.njcn.rdms.framework.security.core.util.SecurityFrameworkUtils;
 import com.njcn.rdms.module.project.constant.ObjectRoleConstants;
 import com.njcn.rdms.module.project.constant.ProjectObjectConstants;
@@ -8,6 +9,7 @@ import com.njcn.rdms.module.project.dal.mysql.member.UserObjectRoleMapper;
 import com.njcn.rdms.module.project.enums.ErrorCodeConstants;
 import com.njcn.rdms.module.system.api.permission.ObjectPermissionApi;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -23,6 +25,7 @@ import static com.njcn.rdms.framework.common.exception.util.ServiceExceptionUtil
 /**
  * 项目对象权限服务。
  */
+@Slf4j
 @Service
 public class ProjectObjectPermissionService implements ObjectPermissionService {
 
@@ -53,7 +56,7 @@ public class ProjectObjectPermissionService implements ObjectPermissionService {
             return;
         }
         String normalizedPermission = normalizePermission(permission);
-        // 任一角色含该权限码即放行（等价于多角色 union；短路求值，权限码命中早 return）
+        // 任一角色含该权限码即放行（等价于多角色 union；短路求值）
         boolean allowed = userRoles.stream()
                 .map(UserObjectRoleDO::getRoleId)
                 .distinct()
@@ -63,6 +66,33 @@ public class ProjectObjectPermissionService implements ObjectPermissionService {
         }
     }
 
+    @Override
+    public boolean hasPermission(Long objectId, String permission) {
+        if (objectId == null || StrUtil.isBlank(permission)) {
+            return false;
+        }
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        if (userId == null) {
+            return false;
+        }
+        try {
+            // 先确认是对象成员，非成员直接返回 false
+            List<UserObjectRoleDO> userRoles = userObjectRoleMapper
+                    .selectActiveListByObjectAndUserId(ProjectObjectConstants.OBJECT_TYPE, objectId, userId);
+            if (userRoles.isEmpty()) {
+                return false;
+            }
+            String normalizedPermission = permission.trim();
+            return userRoles.stream()
+                    .map(UserObjectRoleDO::getRoleId)
+                    .distinct()
+                    .anyMatch(roleId -> getRolePermissions(roleId).contains(normalizedPermission));
+        } catch (Exception e) {
+            log.warn("[hasPermission] objectId={}, permission={} 查询权限失败", objectId, permission, e);
+            return false;
+        }
+    }
+
     private Set<String> getRolePermissions(Long roleId) {
         Set<String> permissions = objectPermissionApi
                 .getObjectRolePermissions(roleId, ObjectRoleConstants.ROLE_SCOPE_OBJECT, ProjectObjectConstants.OBJECT_TYPE)

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/project/ProjectService.java

@@ -60,4 +60,10 @@ public interface ProjectService {
 
     void autoStartProjectIfPending(Long projectId, String triggerAction);
 
+    /**
+     * 重算项目进度并落库：AVG(项目下所有根任务 progressRate)，沿用 task 维度的 progress_excluded 排除集合。
+     * 由任务侧在"任务进度变化 / 状态变更 / 创建删除 / 父子结构变化"等入口触发。
+     */
+    void recalcProgress(Long projectId);
+
 }

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/project/ProjectServiceImpl.java

@@ -32,9 +32,11 @@ import com.njcn.rdms.module.project.dal.dataobject.status.ObjectStatusTransition
 import com.njcn.rdms.module.project.dal.mysql.audit.BizAuditLogMapper;
 import com.njcn.rdms.module.project.dal.mysql.member.UserObjectRoleMapper;
 import com.njcn.rdms.module.project.dal.mysql.product.ProductMapper;
+import com.njcn.rdms.module.project.constant.ProjectTaskConstants;
 import com.njcn.rdms.module.project.dal.mysql.project.ProjectMapper;
 import com.njcn.rdms.module.project.dal.mysql.project.ProjectRequirementModuleMapper;
 import com.njcn.rdms.module.project.dal.mysql.project.ProjectStatusLogMapper;
+import com.njcn.rdms.module.project.dal.mysql.project.task.ProjectTaskMapper;
 import com.njcn.rdms.module.project.dal.mysql.status.ObjectStatusModelMapper;
 import com.njcn.rdms.module.project.dal.mysql.status.ObjectStatusTransitionMapper;
 import com.njcn.rdms.module.project.enums.ErrorCodeConstants;
@@ -58,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -108,6 +111,8 @@ class ProjectServiceImpl implements ProjectService {
     @Resource
     private ProjectRequirementModuleMapper projectRequirementModuleMapper;
     @Resource
+    private ProjectTaskMapper projectTaskMapper;
+    @Resource
     private com.njcn.rdms.module.project.service.member.ObjectRoleAutoAssignService objectRoleAutoAssignService;
     @Resource
     private ObjectDataScopeService objectDataScopeService;
@@ -634,6 +639,39 @@ class ProjectServiceImpl implements ProjectService {
         changeStatus(project, transition, ObjectActivityConstants.PROJECT_ACTION_AUTO_START, reason);
     }
 
+    @Override
+    public void recalcProgress(Long projectId) {
+        if (projectId == null) {
+            return;
+        }
+        ProjectDO project = projectMapper.selectById(projectId);
+        if (project == null) {
+            // 项目已被删除（删除项目时其下任务已不可达，无须再触发；此处兜底，避免上游误调）
+            return;
+        }
+        List<String> excludedStatusCodes = objectStatusModelMapper
+                .selectProgressExcludedStatusCodesByObjectTypeEnabled(ProjectTaskConstants.OBJECT_TYPE);
+        BigDecimal newProgress = normalizeProgress(projectTaskMapper
+                .selectRootTaskAvgProgressByProjectId(projectId,
+                        excludedStatusCodes == null ? Collections.emptyList() : excludedStatusCodes));
+        // 与当前缓存值数值相等则跳过 UPDATE，避免不必要的写与审计字段抖动
+        BigDecimal current = project.getProgressRate();
+        if (current != null && current.compareTo(newProgress) == 0) {
+            return;
+        }
+        projectMapper.updateProgressRateById(projectId, newProgress);
+    }
+
+    /**
+     * 进度归一化：null → 0.00，非 null → scale=2 HALF_UP。与执行/任务层口径一致。
+     */
+    private BigDecimal normalizeProgress(BigDecimal progress) {
+        if (progress == null) {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+        return progress.setScale(2, RoundingMode.HALF_UP);
+    }
+
     @VisibleForTesting
     void validateCreateReqVO(ProjectSaveReqVO createReqVO) {
         validateProjectCodeUnique(null, createReqVO.getProjectCode());

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/project/task/ProjectTaskAggregateService.java

@@ -0,0 +1,30 @@
+package com.njcn.rdms.module.project.service.project.task;
+
+import com.njcn.rdms.framework.common.pojo.PageResult;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskBoardPageRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskStatusBoardRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateBoardPageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregatePageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateStatusBoardReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskSummaryReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskSummaryRespVO;
+
+/**
+ * 项目级跨执行任务查询 Service（与执行级 {@link ProjectTaskService} 互补）。
+ * 服务于"我的任务"、"项目全部任务"两种跨执行视角。
+ */
+public interface ProjectTaskAggregateService {
+
+    PageResult<ProjectTaskRespVO> getAggregateTaskPage(Long projectId, ProjectTaskAggregatePageReqVO reqVO);
+
+    ProjectTaskStatusBoardRespVO getAggregateTaskStatusBoard(Long projectId, ProjectTaskAggregateStatusBoardReqVO reqVO);
+
+    ProjectTaskBoardPageRespVO getAggregateTaskBoardPage(Long projectId, ProjectTaskAggregateBoardPageReqVO reqVO);
+
+    /**
+     * scope=mine（默认）: 当前用户 owner 或活跃协办;
+     * scope=all: 全项目任务，要求 project:task:list-all 权限码，否则抛 PROJECT_OBJECT_PERMISSION_DENIED。
+     */
+    ProjectTaskSummaryRespVO getAggregateTaskSummary(Long projectId, ProjectTaskSummaryReqVO reqVO);
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/project/task/ProjectTaskAggregateServiceImpl.java

@@ -0,0 +1,301 @@
+package com.njcn.rdms.module.project.service.project.task;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.rdms.framework.common.pojo.PageResult;
+import com.njcn.rdms.framework.security.core.util.SecurityFrameworkUtils;
+import com.njcn.rdms.module.project.constant.ProjectTaskConstants;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskBoardPageRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.ProjectTaskStatusBoardRespVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateBoardPageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregatePageReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskAggregateStatusBoardReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskSummaryReqVO;
+import com.njcn.rdms.module.project.controller.admin.project.task.vo.aggregate.ProjectTaskSummaryRespVO;
+import com.njcn.rdms.module.project.dal.dataobject.project.task.ProjectTaskDO;
+import com.njcn.rdms.module.project.dal.dataobject.status.ObjectStatusModelDO;
+import com.njcn.rdms.module.project.dal.mysql.project.task.ProjectTaskMapper;
+import com.njcn.rdms.module.project.dal.mysql.status.ObjectStatusModelMapper;
+import com.njcn.rdms.module.project.framework.security.service.ProjectObjectPermissionService;
+import com.njcn.rdms.module.project.service.project.permission.VisibilityScope;
+import com.njcn.rdms.module.project.service.project.permission.VisibilityScopeResolver;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class ProjectTaskAggregateServiceImpl implements ProjectTaskAggregateService {
+
+    private static final ZoneId SERVER_ZONE = ZoneId.of("Asia/Shanghai");
+
+    @Resource
+    private ProjectTaskMapper projectTaskMapper;
+    @Resource
+    private ProjectTaskService projectTaskService;
+    @Resource
+    private ObjectStatusModelMapper objectStatusModelMapper;
+    @Resource
+    private VisibilityScopeResolver visibilityScopeResolver;
+    @Resource
+    private ProjectObjectPermissionService projectObjectPermissionService;
+
+    // ========= 公共 helper =========
+
+    private LocalDate today() {
+        return LocalDate.now(SERVER_ZONE);
+    }
+
+    private LocalDate weekStart(LocalDate today) {
+        return today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+    }
+
+    private LocalDate weekEnd(LocalDate today) {
+        return today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+    }
+
+    private List<String> loadTerminalStatusCodes() {
+        return objectStatusModelMapper.selectTerminalStatusCodesByObjectTypeEnabled(ProjectTaskConstants.OBJECT_TYPE);
+    }
+
+    /**
+     * 判定"项目全部"语义：既无 involveUserId 又无 ownerId。
+     */
+    private boolean isAggregateAllScope(Long involveUserId, Long ownerId) {
+        return involveUserId == null && ownerId == null;
+    }
+
+    /**
+     * page / board-page / status-board 的 scope 解析（读路径"宽容降级"）：
+     * 入参组合 = allScopeIntent=true + 有 list-all → seesAll；否则 → resolveForProject 过滤（不抛 403）。
+     */
+    private VisibilityScope resolveScopeForRead(Long projectId, boolean allScopeIntent) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        if (allScopeIntent) {
+            boolean hasListAll = projectObjectPermissionService.hasPermission(projectId, ProjectTaskConstants.PERMISSION_LIST_ALL);
+            if (hasListAll) {
+                return VisibilityScope.all();
+            }
+        }
+        return visibilityScopeResolver.resolveForProject(projectId, userId);
+    }
+
+    // ========= page =========
+
+    @Override
+    public PageResult<ProjectTaskRespVO> getAggregateTaskPage(Long projectId, ProjectTaskAggregatePageReqVO reqVO) {
+        // 空数组语义短路:前端明确"按 0 个执行状态过滤" → 返空集合,不让 MyBatis 退化成"不过滤"
+        if (reqVO.getExecutionStatusCodes() != null && reqVO.getExecutionStatusCodes().isEmpty()) {
+            return PageResult.empty();
+        }
+        boolean allScope = isAggregateAllScope(reqVO.getInvolveUserId(), reqVO.getOwnerId());
+        VisibilityScope scope = resolveScopeForRead(projectId, allScope);
+        LocalDate today = today();
+        LocalDate weekStart = weekStart(today);
+        LocalDate weekEnd = weekEnd(today);
+        List<String> terminalStatusCodes = loadTerminalStatusCodes();
+
+        Page<ProjectTaskDO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        IPage<ProjectTaskDO> ipage = projectTaskMapper.selectAggregatePageByProjectId(
+                projectId, scope.seesAll(), scope.taskIds(), reqVO, terminalStatusCodes, weekStart, weekEnd, today, page);
+        PageResult<ProjectTaskDO> doPage = new PageResult<>(ipage.getRecords(), ipage.getTotal());
+        return projectTaskService.assembleTaskRespVOPageCrossExecution(projectId, doPage);
+    }
+
+    // ========= status-board =========
+
+    @Override
+    public ProjectTaskStatusBoardRespVO getAggregateTaskStatusBoard(Long projectId, ProjectTaskAggregateStatusBoardReqVO reqVO) {
+        // 空数组语义短路:跳过 SQL,但保留状态列骨架(前端看板依赖全列表渲染),count 全部 0
+        if (reqVO.getExecutionStatusCodes() != null && reqVO.getExecutionStatusCodes().isEmpty()) {
+            List<ObjectStatusModelDO> emptyStatusModels =
+                    objectStatusModelMapper.selectListByObjectTypeEnabled(ProjectTaskConstants.OBJECT_TYPE);
+            return buildStatusBoardResponse(emptyStatusModels, Collections.emptyMap());
+        }
+        boolean allScope = isAggregateAllScope(reqVO.getInvolveUserId(), reqVO.getOwnerId());
+        VisibilityScope scope = resolveScopeForRead(projectId, allScope);
+        LocalDate today = today();
+        LocalDate weekStart = weekStart(today);
+        LocalDate weekEnd = weekEnd(today);
+        List<String> terminalStatusCodes = loadTerminalStatusCodes();
+
+        List<ObjectStatusModelDO> statusModels =
+                objectStatusModelMapper.selectListByObjectTypeEnabled(ProjectTaskConstants.OBJECT_TYPE);
+
+        List<ProjectTaskMapper.StatusCountRow> rows = projectTaskMapper.selectAggregateStatusCount(
+                projectId, scope.seesAll(), scope.taskIds(), reqVO, terminalStatusCodes, weekStart, weekEnd, today);
+        Map<String, Long> countMap = rows.stream()
+                .collect(Collectors.toMap(
+                        ProjectTaskMapper.StatusCountRow::getStatusCode,
+                        ProjectTaskMapper.StatusCountRow::getCount));
+
+        return buildStatusBoardResponse(statusModels, countMap);
+    }
+
+    /**
+     * 按状态模型全量列出，count=0 的状态也输出（前端看板始终显示所有列）。
+     */
+    private ProjectTaskStatusBoardRespVO buildStatusBoardResponse(
+            List<ObjectStatusModelDO> statusModels, Map<String, Long> countMap) {
+        List<ProjectTaskStatusBoardRespVO.ProjectStatusBoardItemVO> items = statusModels.stream()
+                .map(sm -> {
+                    ProjectTaskStatusBoardRespVO.ProjectStatusBoardItemVO item =
+                            new ProjectTaskStatusBoardRespVO.ProjectStatusBoardItemVO();
+                    item.setStatusCode(sm.getStatusCode());
+                    item.setStatusName(sm.getStatusName());
+                    item.setCount(countMap.getOrDefault(sm.getStatusCode(), 0L));
+                    item.setSort(sm.getSort());
+                    item.setTerminal(sm.getTerminalFlag());
+                    return item;
+                })
+                .collect(Collectors.toList());
+
+        long total = items.stream().mapToLong(i -> i.getCount() == null ? 0L : i.getCount()).sum();
+
+        ProjectTaskStatusBoardRespVO resp = new ProjectTaskStatusBoardRespVO();
+        resp.setTotal(total);
+        resp.setItems(items);
+        return resp;
+    }
+
+    // ========= board-page =========
+
+    @Override
+    public ProjectTaskBoardPageRespVO getAggregateTaskBoardPage(Long projectId, ProjectTaskAggregateBoardPageReqVO reqVO) {
+        // 空数组语义短路:跳过 SQL,保留按 statusCodes 过滤后的列骨架,每列 list=[] / total=0
+        boolean emptyExecStatusCodes = reqVO.getExecutionStatusCodes() != null && reqVO.getExecutionStatusCodes().isEmpty();
+
+        List<ObjectStatusModelDO> allStatusModels =
+                objectStatusModelMapper.selectListByObjectTypeEnabled(ProjectTaskConstants.OBJECT_TYPE);
+        List<ObjectStatusModelDO> targetStatusModels;
+        if (reqVO.getStatusCodes() == null || reqVO.getStatusCodes().isEmpty()) {
+            targetStatusModels = allStatusModels;
+        } else {
+            Set<String> filter = new HashSet<>(reqVO.getStatusCodes());
+            targetStatusModels = allStatusModels.stream()
+                    .filter(sm -> filter.contains(sm.getStatusCode()))
+                    .collect(Collectors.toList());
+        }
+
+        if (emptyExecStatusCodes) {
+            List<ProjectTaskBoardPageRespVO.ColumnItemVO> emptyItems = targetStatusModels.stream()
+                    .map(sm -> buildColumnItemVO(sm, PageResult.empty()))
+                    .collect(Collectors.toList());
+            ProjectTaskBoardPageRespVO emptyResp = new ProjectTaskBoardPageRespVO();
+            emptyResp.setItems(emptyItems);
+            return emptyResp;
+        }
+
+        boolean allScope = isAggregateAllScope(reqVO.getInvolveUserId(), reqVO.getOwnerId());
+        VisibilityScope scope = resolveScopeForRead(projectId, allScope);
+        LocalDate today = today();
+        LocalDate weekStart = weekStart(today);
+        LocalDate weekEnd = weekEnd(today);
+        List<String> terminalStatusCodes = loadTerminalStatusCodes();
+
+        List<ProjectTaskBoardPageRespVO.ColumnItemVO> items = targetStatusModels.stream()
+                .map(sm -> buildAggregateBoardColumn(projectId, scope, reqVO, sm,
+                        terminalStatusCodes, today, weekStart, weekEnd))
+                .collect(Collectors.toList());
+
+        ProjectTaskBoardPageRespVO resp = new ProjectTaskBoardPageRespVO();
+        resp.setItems(items);
+        return resp;
+    }
+
+    private ProjectTaskBoardPageRespVO.ColumnItemVO buildAggregateBoardColumn(
+            Long projectId, VisibilityScope scope,
+            ProjectTaskAggregateBoardPageReqVO reqVO, ObjectStatusModelDO sm,
+            List<String> terminalStatusCodes, LocalDate today, LocalDate weekStart, LocalDate weekEnd) {
+
+        // 复用 selectAggregatePageByProjectId，构造单列过滤的 innerReq
+        ProjectTaskAggregatePageReqVO innerReq = new ProjectTaskAggregatePageReqVO();
+        innerReq.setPageNo(reqVO.getPageNo());
+        innerReq.setPageSize(reqVO.getPageSize());
+        innerReq.setKeyword(reqVO.getKeyword());
+        innerReq.setExecutionIds(reqVO.getExecutionIds());
+        innerReq.setExecutionStatusCodes(reqVO.getExecutionStatusCodes());
+        innerReq.setInvolveUserId(reqVO.getInvolveUserId());
+        innerReq.setOwnerId(reqVO.getOwnerId());
+        innerReq.setStatusCodes(Collections.singletonList(sm.getStatusCode()));
+        innerReq.setPriority(reqVO.getPriority());
+        innerReq.setParentTaskId(reqVO.getParentTaskId());
+        innerReq.setDueRange(reqVO.getDueRange());
+        innerReq.setUpdateTime(reqVO.getUpdateTime());
+        // board-page 不传 sortBy / sortOrder，用 page 查询的默认排序（plannedEndDate ASC）
+
+        Page<ProjectTaskDO> page = new Page<>(innerReq.getPageNo(), innerReq.getPageSize());
+        IPage<ProjectTaskDO> ipage = projectTaskMapper.selectAggregatePageByProjectId(
+                projectId, scope.seesAll(), scope.taskIds(), innerReq, terminalStatusCodes, weekStart, weekEnd, today, page);
+        PageResult<ProjectTaskDO> doPage = new PageResult<>(ipage.getRecords(), ipage.getTotal());
+        PageResult<ProjectTaskRespVO> voPage =
+                projectTaskService.assembleTaskRespVOPageCrossExecution(projectId, doPage);
+
+        return buildColumnItemVO(sm, voPage);
+    }
+
+    private ProjectTaskBoardPageRespVO.ColumnItemVO buildColumnItemVO(
+            ObjectStatusModelDO sm, PageResult<ProjectTaskRespVO> voPage) {
+        ProjectTaskBoardPageRespVO.ColumnItemVO col = new ProjectTaskBoardPageRespVO.ColumnItemVO();
+        col.setStatusCode(sm.getStatusCode());
+        col.setStatusName(sm.getStatusName());
+        col.setSort(sm.getSort());
+        col.setTerminal(sm.getTerminalFlag());
+        col.setList(voPage.getList());
+        col.setTotal(voPage.getTotal());
+        return col;
+    }
+
+    // ========= summary =========
+
+    @Override
+    public ProjectTaskSummaryRespVO getAggregateTaskSummary(Long projectId, ProjectTaskSummaryReqVO reqVO) {
+        boolean isAll = "all".equalsIgnoreCase(reqVO.getScope());
+        if (isAll) {
+            // scope=all 强校验 list-all（无权抛 403，与 page/board-page/status-board 的"宽容降级"不同）
+            projectObjectPermissionService.checkPermission(projectId, ProjectTaskConstants.PERMISSION_LIST_ALL, false);
+        }
+
+        LocalDate today = today();
+        LocalDate weekStart = weekStart(today);
+        LocalDate weekEnd = weekEnd(today);
+        List<String> terminalStatusCodes = loadTerminalStatusCodes();
+
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        Long involveUserId = isAll ? null : userId;
+        VisibilityScope scope = isAll
+                ? VisibilityScope.all()
+                : visibilityScopeResolver.resolveForProject(projectId, userId);
+
+        Map<String, Long> counts = projectTaskMapper.selectAggregateSummaryCounts(
+                projectId, scope.seesAll(), scope.taskIds(), involveUserId,
+                terminalStatusCodes, ProjectTaskConstants.STATUS_COMPLETED,
+                today, weekStart, weekEnd);
+
+        ProjectTaskSummaryRespVO resp = new ProjectTaskSummaryRespVO();
+        resp.setOverdue(zeroIfNull(counts.get("overdue")));
+        resp.setDueToday(zeroIfNull(counts.get("dueToday")));
+        resp.setDueThisWeek(zeroIfNull(counts.get("dueThisWeek")));
+        resp.setDoneThisWeek(zeroIfNull(counts.get("doneThisWeek")));
+        resp.setToday(today);
+        resp.setWeekStart(weekStart);
+        resp.setWeekEnd(weekEnd);
+        return resp;
+    }
+
+    private Long zeroIfNull(Long v) {
+        return v == null ? 0L : v;
+    }
+}

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/project/task/ProjectTaskService.java

@@ -40,6 +40,18 @@ public interface ProjectTaskService {
     PageResult<ProjectTaskRespVO> assembleTaskRespVOPage(Long projectId, Long executionId,
                                                         PageResult<ProjectTaskDO> doPage);
 
+    /**
+     * 跨执行装配 ProjectTaskRespVO 分页结果。
+     *
+     * 与 {@link #assembleTaskRespVOPage(Long, Long, PageResult)} 区别:
+     * 本方法不绑单个 executionId,允许 page 内任务来自项目下任意多个执行;
+     * 装配时按 task.executionId 分组批量回填 executionName / executionStatusCode
+     * (走 enrichExecutionInfo helper)。
+     * <p><b>不填充字段</b>:executionOwnerId / projectRequirementName / projectRequirementStatusCode
+     * (跨多 execution 场景无法共享单 execution 上下文)。前端跨执行视图按需处理。</p>
+     */
+    PageResult<ProjectTaskRespVO> assembleTaskRespVOPageCrossExecution(Long projectId, PageResult<ProjectTaskDO> doPage);
+
     void changeTaskStatus(Long projectId, Long executionId, Long taskId, ProjectTaskStatusActionReqVO reqVO);
 
     /**

rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/project/task/ProjectTaskServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.rdms.module.project.service.project.task;
 
+import cn.hutool.core.collection.CollUtil;
 import com.njcn.rdms.framework.common.pojo.CommonResult;
 import com.njcn.rdms.framework.common.pojo.PageResult;
 import com.njcn.rdms.framework.common.util.json.JsonUtils;
@@ -62,6 +63,7 @@ import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -85,6 +87,8 @@ import static com.njcn.rdms.framework.common.exception.util.ServiceExceptionUtil
 @Slf4j
 public class ProjectTaskServiceImpl implements ProjectTaskService {
 
+    private static final ZoneId SERVER_ZONE = ZoneId.of("Asia/Shanghai");
+
     @Resource
     private ProjectMapper projectMapper;
     @Resource
@@ -173,6 +177,9 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
         if (task.getParentTaskId() != null) {
             recalcParentProgressFrom(task.getParentTaskId());
         }
+        // 项目进度推算：无论新建的是根任务（进度=0 进入项目均值）还是子任务（冒泡后根任务进度可能变化），
+        // 项目均值都可能发生变化，统一触发一次项目层重算（覆盖根任务边界）
+        projectService.recalcProgress(projectId);
 
         writeTaskAuditLog(task, ObjectActivityConstants.TASK_ACTION_CREATE, null, task.getStatusCode(),
                 buildTaskFieldChanges(null, task), null);
@@ -238,6 +245,9 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
             parentsToRecalc.add(newParentId);
         }
         parentsToRecalc.forEach(this::recalcParentProgressFrom);
+        // 项目进度推算：updateTask 可能改变 parent_task_id，使 task 进入/离开"根任务集合"，
+        // 项目均值的分量构成可能变化；无论 progressRate 是否变化都需触发刷新
+        projectService.recalcProgress(projectId);
 
         writeTaskAuditLog(task, ObjectActivityConstants.TASK_ACTION_UPDATE, before.getStatusCode(),
                 task.getStatusCode(), buildTaskFieldChanges(before, task), null);
@@ -281,6 +291,9 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
         if (parentTaskId != null) {
             recalcParentProgressFrom(parentTaskId);
         }
+        // 项目进度推算：无论删除的是根任务（项目分量减一）还是子任务（父链冒泡到根后根任务进度变化），
+        // 项目均值都可能发生变化，统一触发一次项目层重算（覆盖根任务边界）
+        projectService.recalcProgress(task.getProjectId());
 
         writeTaskAuditLog(task, ObjectActivityConstants.TASK_ACTION_DELETE, fromStatus, null, null, reason);
     }
@@ -361,6 +374,8 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
         if (task.getParentTaskId() != null) {
             recalcParentProgressFrom(task.getParentTaskId());
         }
+        // 项目进度推算：worklog 驱动的任务进度变化（叶子任务），无论叶子任务是否同时是根任务都需触发
+        projectService.recalcProgress(task.getProjectId());
     }
 
     @Override
@@ -462,6 +477,8 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
                 .loadActiveAssigneesGroupedByTaskId(List.of(task.getId())).getOrDefault(task.getId(), List.of())));
         respVO.setTotalSpentHours(taskWorklogService.sumDurationByTaskId(task.getId()));
         respVO.setExecutionOwnerId(execution.getOwnerId());
+        respVO.setExecutionName(execution.getExecutionName());
+        respVO.setExecutionStatusCode(execution.getStatusCode());
         if (task.getParentTaskId() != null) {
             ProjectTaskDO parentTask = projectTaskMapper.selectById(task.getParentTaskId());
             respVO.setParentTaskOwnerId(parentTask == null ? null : parentTask.getOwnerId());
@@ -489,40 +506,15 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
         if (list == null || list.isEmpty()) {
             return voPageResult;
         }
-        // 批量装配 ownerNickname + assignees，统一收集所有需要的 userId 一次性查 nickname，避免 N+1
-        Set<Long> taskIds = list.stream().map(ProjectTaskRespVO::getId)
-                .filter(Objects::nonNull).collect(Collectors.toCollection(LinkedHashSet::new));
-        Map<Long, List<TaskAssigneeDO>> assigneeMap = taskAssigneeService
-                .loadActiveAssigneesGroupedByTaskId(taskIds);
-        Map<Long, BigDecimal> spentHoursMap = taskWorklogService.sumDurationGroupedByTaskIds(taskIds);
-        Set<Long> userIdsToResolve = list.stream()
-                .map(ProjectTaskRespVO::getOwnerId)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-        assigneeMap.values().forEach(items -> items.forEach(a -> userIdsToResolve.add(a.getUserId())));
-        Map<Long, String> nicknameMap = loadOwnerNicknameMap(userIdsToResolve);
-        // 批量查父任务 owner，避免按 list 循环 N+1
-        Set<Long> parentTaskIds = list.stream().map(ProjectTaskRespVO::getParentTaskId)
-                .filter(Objects::nonNull).collect(Collectors.toCollection(LinkedHashSet::new));
-        Map<Long, Long> parentTaskOwnerMap = parentTaskIds.isEmpty()
-                ? Map.of()
-                : projectTaskMapper.selectBatchIds(parentTaskIds).stream()
-                        .collect(Collectors.toMap(ProjectTaskDO::getId, ProjectTaskDO::getOwnerId));
+        List<ProjectTaskDO> taskList = pageResult.getList();
         // 执行 owner 单条查询，整页共享（URL 路径定 executionId）
         ProjectExecutionDO execution = projectExecutionMapper.selectByProjectIdAndId(projectId, executionId);
         Long executionOwnerId = execution == null ? null : execution.getOwnerId();
         fillProjectRequirementInfo(list, execution);
+        // 批量回填 ownerNickname / assignees / totalSpentHours / parentTaskOwnerId（与 executionId 无关）
+        enrichTaskRelations(taskList, list);
         list.forEach(vo -> {
-            vo.setOwnerNickname(nicknameMap.get(vo.getOwnerId()));
-            List<TaskAssigneeDO> activeList = assigneeMap.getOrDefault(vo.getId(), List.of());
-            vo.setAssignees(activeList.stream()
-                    .map(a -> toAssigneeView(a, nicknameMap.get(a.getUserId())))
-                    .collect(Collectors.toList()));
-            vo.setTotalSpentHours(spentHoursMap.getOrDefault(vo.getId(), BigDecimal.ZERO));
             vo.setExecutionOwnerId(executionOwnerId);
-            if (vo.getParentTaskId() != null) {
-                vo.setParentTaskOwnerId(parentTaskOwnerMap.get(vo.getParentTaskId()));
-            }
             // 列表行 cancel/pause/resume/complete 按钮依赖 availableActions，与详情同款装配 lifecycle。
             // 单行装配失败做兜底降级（status_model 缺失等脏数据），避免影响整页返回。
             try {
@@ -532,9 +524,112 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
                         vo.getId(), vo.getStatusCode(), e.getMessage());
             }
         });
+        enrichExecutionInfo(voPageResult.getList());
         return voPageResult;
     }
 
+    /**
+     * 批量回填与 executionId 无关的任务关联字段:ownerNickname / assignees / totalSpentHours / parentTaskOwnerId。
+     * <p>由 {@link #assembleTaskRespVOPage} 与 {@link #assembleTaskRespVOPageCrossExecution} 共享,
+     * 抽取后两条装配路径保证字段口径一致,避免演进漂移。
+     *
+     * @param taskList 原始 DO 列表(用于 enrichTaskRelations 内部如有需要直接访问 DO 字段)
+     * @param voList   已 BeanUtils.toBean 转换好的 VO 列表,本方法在其上 set 字段
+     */
+    private void enrichTaskRelations(List<ProjectTaskDO> taskList, List<ProjectTaskRespVO> voList) {
+        if (CollUtil.isEmpty(voList)) {
+            return;
+        }
+        // 批量装配 ownerNickname + assignees，统一收集所有需要的 userId 一次性查 nickname，避免 N+1
+        Set<Long> taskIds = voList.stream().map(ProjectTaskRespVO::getId)
+                .filter(Objects::nonNull).collect(Collectors.toCollection(LinkedHashSet::new));
+        Map<Long, List<TaskAssigneeDO>> assigneeMap = taskAssigneeService
+                .loadActiveAssigneesGroupedByTaskId(taskIds);
+        Map<Long, BigDecimal> spentHoursMap = taskWorklogService.sumDurationGroupedByTaskIds(taskIds);
+        Set<Long> userIdsToResolve = voList.stream()
+                .map(ProjectTaskRespVO::getOwnerId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+        assigneeMap.values().forEach(items -> items.forEach(a -> userIdsToResolve.add(a.getUserId())));
+        Map<Long, String> nicknameMap = loadOwnerNicknameMap(userIdsToResolve);
+        // 批量查父任务 owner，避免按 list 循环 N+1
+        Set<Long> parentTaskIds = voList.stream().map(ProjectTaskRespVO::getParentTaskId)
+                .filter(Objects::nonNull).collect(Collectors.toCollection(LinkedHashSet::new));
+        Map<Long, Long> parentTaskOwnerMap;
+        if (parentTaskIds.isEmpty()) {
+            parentTaskOwnerMap = Map.of();
+        } else {
+            parentTaskOwnerMap = new HashMap<>();
+            for (ProjectTaskDO p : projectTaskMapper.selectBatchIds(parentTaskIds)) {
+                parentTaskOwnerMap.put(p.getId(), p.getOwnerId());
+            }
+        }
+        voList.forEach(vo -> {
+            vo.setOwnerNickname(nicknameMap.get(vo.getOwnerId()));
+            List<TaskAssigneeDO> activeList = assigneeMap.getOrDefault(vo.getId(), List.of());
+            vo.setAssignees(activeList.stream()
+                    .map(a -> toAssigneeView(a, nicknameMap.get(a.getUserId())))
+                    .collect(Collectors.toList()));
+            vo.setTotalSpentHours(spentHoursMap.getOrDefault(vo.getId(), BigDecimal.ZERO));
+            if (vo.getParentTaskId() != null) {
+                vo.setParentTaskOwnerId(parentTaskOwnerMap.get(vo.getParentTaskId()));
+            }
+        });
+    }
+
+    @Override
+    public PageResult<ProjectTaskRespVO> assembleTaskRespVOPageCrossExecution(Long projectId, PageResult<ProjectTaskDO> doPage) {
+        if (doPage == null || CollUtil.isEmpty(doPage.getList())) {
+            return new PageResult<>(Collections.emptyList(), doPage == null ? 0L : doPage.getTotal());
+        }
+        List<ProjectTaskDO> taskList = doPage.getList();
+        List<ProjectTaskRespVO> voList = BeanUtils.toBean(taskList, ProjectTaskRespVO.class);
+
+        // 批量回填 ownerNickname / assignees / totalSpentHours / parentTaskOwnerId（与 executionId 无关）
+        enrichTaskRelations(taskList, voList);
+
+        voList.forEach(vo -> {
+            // executionOwnerId 在跨执行场景不设置（涉及多个 execution，无"该执行的 ownerId"概念）
+            try {
+                applyLifecycle(vo);
+            } catch (Exception e) {
+                log.warn("[assembleTaskRespVOPageCrossExecution] applyLifecycle 装配失败 taskId={}", vo.getId(), e);
+            }
+        });
+
+        // 按 task.executionId 分组批量回填 executionName / executionStatusCode
+        enrichExecutionInfo(voList);
+
+        return new PageResult<>(voList, doPage.getTotal());
+    }
+
+    /**
+     * 给一批 ProjectTaskRespVO 批量回填 executionName / executionStatusCode。
+     * 一次查询所有涉及的 executionId,避免 N+1。
+     */
+    private void enrichExecutionInfo(List<ProjectTaskRespVO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return;
+        }
+        Set<Long> executionIds = list.stream()
+                .map(ProjectTaskRespVO::getExecutionId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        if (executionIds.isEmpty()) {
+            return;
+        }
+        List<ProjectExecutionDO> executions = projectExecutionMapper.selectBatchIds(executionIds);
+        Map<Long, ProjectExecutionDO> executionMap = executions.stream()
+                .collect(Collectors.toMap(ProjectExecutionDO::getId, e -> e, (a, b) -> a));
+        list.forEach(vo -> {
+            ProjectExecutionDO exec = executionMap.get(vo.getExecutionId());
+            if (exec != null) {
+                vo.setExecutionName(exec.getExecutionName());
+                vo.setExecutionStatusCode(exec.getStatusCode());
+            }
+        });
+    }
+
     /**
      * 把任务 RespVO 上的项目需求信息（TD-013）回填。
      * <p>本服务的 task 查询入口均以 executionId 为收口（详情 / page / board-page 共用 assembleTaskRespVOPage），
@@ -628,7 +723,7 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
      * - 进入终态（toStatus.terminalFlag=true）且未填写时，写入 actualEndDate
      */
     private void maybeFillActualDates(ProjectTaskDO task, String fromStatus, String toStatus) {
-        LocalDate today = LocalDate.now();
+        LocalDate today = LocalDate.now(SERVER_ZONE);
         LocalDate newActualStart = null;
         LocalDate newActualEnd = null;
         if (task.getActualStartDate() == null) {
@@ -810,11 +905,16 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
         writeTaskAuditLog(task, actionCode, fromStatus, toStatus, null, reason);
         maybeFillActualDates(task, fromStatus, toStatus);
 
-        // 完成动作：兜底把任务进度刷到 100%，并触发父任务 AVG 重算
+        // 完成动作：兜底把任务进度刷到 100%，并触发父任务 AVG 重算（forceCompleteProgress 内部触发项目刷新）
         if ("complete".equals(actionCode)) {
             forceCompleteProgress(task);
-        } else if (task.getParentTaskId() != null) {
-            recalcParentProgressFrom(task.getParentTaskId());
+        } else {
+            if (task.getParentTaskId() != null) {
+                recalcParentProgressFrom(task.getParentTaskId());
+            }
+            // 项目进度推算：非完成状态变更（cancel/pause/resume）。cancel 进 progress_excluded 影响项目均值；
+            // pause/resume 不影响 progress_excluded，但根任务的 pause/resume 不改 progressRate 时 recalc 也是幂等的
+            projectService.recalcProgress(task.getProjectId());
         }
 
         // 取消 / 暂停 / 恢复：触发子任务级联（每个子任务的内部链路自身会再级联自己的子，链式实现整棵子树）
@@ -834,6 +934,7 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
     private void forceCompleteProgress(ProjectTaskDO task) {
         BigDecimal full = BigDecimal.valueOf(100);
         if (progressNumericallyEquals(task.getProgressRate(), full)) {
+            // 进度已经是 100：completed 不在 progress_excluded 集合内，对项目均值无影响，跳过刷新
             return;
         }
         projectTaskMapper.updateProgressRateById(task.getId(), full);
@@ -841,6 +942,8 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
         if (task.getParentTaskId() != null) {
             recalcParentProgressFrom(task.getParentTaskId());
         }
+        // 项目进度推算：根任务 complete 时父链不冒泡，但任务自身 progressRate=100 已变化，必须触发刷新
+        projectService.recalcProgress(task.getProjectId());
     }
 
     /**