From 181cbfec8041fedec3b1507863b78ef486aee91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=BD=AC?=
 <14779346+xswl_123@user.noreply.gitee.com>
Date: Tue, 12 Aug 2025 11:33:58 +0800
Subject: [PATCH] =?UTF-8?q?8-12=20=E6=96=BD=E5=B7=A5=E8=A7=84=E6=A8=A1(?=
 =?UTF-8?q?=E9=A3=8E=E6=9C=BA=E6=95=B0=E9=87=8F)=E4=B8=8B=E6=94=BE?=
 =?UTF-8?q?=E8=87=B3=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=A1=E7=AE=97=E4=BB=BB=E5=8A=A1=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=80=BB=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dite/znpt/domain/entity/ProjectEntity.java   | 2 +-
 .../com/dite/znpt/domain/entity/ProjectTaskEntity.java    | 8 ++++++++
 .../java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java  | 3 +++
 .../com/dite/znpt/service/impl/ProjectServiceImpl.java    | 4 ++++
 .../dite/znpt/web/controller/ProjectTaskController.java   | 8 ++++++--
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java
index 943620b..875b6c3 100644
--- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java
+++ b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java
@@ -89,7 +89,7 @@ public class ProjectEntity extends AuditableEntity implements Serializable {
     @ExcelProperty("项目规模")
     @ApiModelProperty("项目规模")
     @TableField("scale")
-    private String scale;
+    private Integer scale;
 
     @ExcelProperty("总工期，单位天")
     @ApiModelProperty("总工期，单位天")
diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java
index e2a25e8..2776261 100644
--- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java
+++ b/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java
@@ -85,5 +85,13 @@ public class ProjectTaskEntity extends AuditableEntity implements Serializable {
     @ApiModelProperty("项目id")
     @TableField("project_id")
     private String projectId;
+
+    @ApiModelProperty("任务规模")
+    @TableField("scales")
+    private Integer scales;
+
+    @ApiModelProperty("已完成数")
+    @TableField("finished")
+    private Integer finished;
 }
 
diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java
index e1ef86f..7ec32f1 100644
--- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java
+++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java
@@ -38,4 +38,7 @@ public class ProjectInitTaskReq {
     @Size(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, max = 100, message = "任务负责人id长度不能超过100字符")
     @ApiModelProperty("任务负责人id")
     private String mainUserId;
+
+    @ApiModelProperty("任务规模")
+    private Integer scales;
 }
diff --git a/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java
index de2a7e4..38d8b40 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java
@@ -137,7 +137,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
         this.save(entity);
         for (ProjectInitTaskReq taskReq : req.getTasks()) {
             ProjectTaskEntity taskEntity = BeanUtil.copyProperties(taskReq, ProjectTaskEntity.class);
+            if (taskEntity.getScales() == null) {
+                taskEntity.setScales(entity.getScale());
+            }
             taskEntity.setProjectId(entity.getProjectId());
+            taskEntity.setFinished(0);
             projectTaskService.save(taskEntity);
         }
     }
diff --git a/web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java b/web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java
index 1bf92ce..149c905 100644
--- a/web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java
+++ b/web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java
@@ -118,10 +118,14 @@ public class ProjectTaskController {
     @GetMapping("/{projectId}/tasks")
     public Result<ProjectTasksDetailResp> getTaskByProjectId(@PathVariable String projectId) {
         ProjectTasksDetailResp resp = new ProjectTasksDetailResp();
+        resp.setTotal(0);
+        resp.setFinished(0);
         resp.setProjectName(projectService.getById(projectId).getProjectName());
         resp.setList(projectTaskService.getTaskByProjectId(projectId));
-        resp.setTotal(resp.getList().size());
-        resp.setFinished((int) resp.getList().stream().filter(projectTaskResp -> projectTaskResp.getStatus() == 2).count());
+        for (ProjectTaskResp projectTaskResp : resp.getList()) {
+            resp.setTotal(resp.getTotal() + projectTaskResp.getScales());
+            resp.setFinished(resp.getFinished() + projectTaskResp.getFinished());
+        }
         return Result.ok(resp);
     }
 }
\ No newline at end of file