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("总工期，单位天")

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;
 }
 

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;
 }

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);
         }
     }

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());
+        for (ProjectTaskResp projectTaskResp : resp.getList()) {
-        resp.setFinished((int) resp.getList().stream().filter(projectTaskResp -> projectTaskResp.getStatus() == 2).count());
+            resp.setTotal(resp.getTotal() + projectTaskResp.getScales());
+            resp.setFinished(resp.getFinished() + projectTaskResp.getFinished());
+        }
         return Result.ok(resp);
     }
 }