更新

@@ -26,7 +26,7 @@ type TaskStage struct {
 	Name              string `json:"name"`                        //里程碑名称
 	StatusDescription string `json:"statusDescription,omitempty"` //里程碑的完成情况
 	SortBy            int    `json:"sortBy"`                      //
-	PlanCompletedAt   string `json:"planCompletedAt,omitempty"`   //计划完成时间, 例:2006-01-02
-	RealCompletedAt   string `json:"realCompletedAt,omitempty"`   //实际完成时间, 例:2006-01-02
+	PlanCompletedAt   string `json:"planCompletedAt"`             //计划完成时间, 例:2006-01-02
+	RealCompletedAt   string `json:"realCompletedAt"`             //实际完成时间, 例:2006-01-02
 	IsRef             bool   `json:"isRef"`                       //是否已经被下发
 }

@@ -735,9 +735,14 @@ func (srv TaskService) ListTask2(param *command.SearchTaskCommand) (map[string]i
 			continue
 		}
 		stage := adapter.TaskStage{
-			Id:     val.StageId,
-			Name:   val.StageName,
-			SortBy: val.StageSortBy,
+			Id:              val.StageId,
+			Name:            val.StageName,
+			SortBy:          val.StageSortBy,
+			PlanCompletedAt: time.Unix(int64(val.PlanCompletedAt), 0).Local().Format("2006-01-02"),
+			RealCompletedAt: "",
+		}
+		if val.RealCompletedAt > 0 {
+			stage.RealCompletedAt = time.Unix(int64(val.RealCompletedAt), 0).Local().Format("2006-01-02")
 		}
 		switch val.StageSortBy {
 		case 1:
@@ -839,9 +844,14 @@ func (srv TaskService) listTask2ForHrbp(param *command.SearchTaskCommand) (map[s
 			continue
 		}
 		stage := adapter.TaskStage{
-			Id:     val.StageId,
-			Name:   val.StageName,
-			SortBy: val.StageSortBy,
+			Id:              val.StageId,
+			Name:            val.StageName,
+			SortBy:          val.StageSortBy,
+			PlanCompletedAt: time.Unix(int64(val.PlanCompletedAt), 0).Local().Format("2006-01-02"),
+			RealCompletedAt: "",
+		}
+		if val.RealCompletedAt > 0 {
+			stage.RealCompletedAt = time.Unix(int64(val.RealCompletedAt), 0).Local().Format("2006-01-02")
 		}
 		switch val.StageSortBy {
 		case 1:

@@ -86,6 +86,7 @@ type ListTaskStage struct {
 	StageName       string    `pg:"stage_name"`
 	StageSortBy     int       `pg:"stage_sort_by"`
 	PlanCompletedAt int       `pg:"plan_completed_at"`
+	RealCompletedAt int       `pg:"real_completed_at"`
 }
 
 // 获取任务以及里程碑列表，用于页面展示; 有过滤查看权限
@@ -113,6 +114,7 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
 		task_stage."name" as stage_name,
 		task_stage.sort_by as stage_sort_by,
 		task_stage.plan_completed_at,
+		task_stage.real_completed_at,
 		(case 
 			when task_stage.real_completed_at =0 
 			then task_stage.plan_completed_at - floor( extract(epoch from now()))
@@ -143,6 +145,7 @@ func (d *TaskDao) ListTaskStageNotHrbp(param ListTaskCondition) ([]ListTaskStage
 		t_task_tage_1.created_at ,
 		t_task_tage_1."level" ,
 		t_task_tage_1.plan_completed_at,
+		t_task_tage_1.real_completed_at,
 		t_task_tage_1.stage_name,
 		t_task_tage_1.stage_id,
 		t_task_tage_1.stage_sort_by
@@ -232,6 +235,7 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
 		task_stage."name" as stage_name,
 		task_stage.sort_by as stage_sort_by,
 		task_stage.plan_completed_at,
+		task_stage.real_completed_at,
 		(case 
 			when task_stage.real_completed_at =0 
 			then task_stage.plan_completed_at - floor( extract(epoch from now()))
@@ -263,6 +267,7 @@ func (d *TaskDao) ListTaskStageByHrbp(param ListTaskCondition) ([]ListTaskStage,
 		t_task_tage_1.created_at ,
 		t_task_tage_1."level" ,
 		t_task_tage_1.plan_completed_at,
+		t_task_tage_1.real_completed_at,
 		t_task_tage_1.stage_name,
 		t_task_tage_1.stage_id,
 		t_task_tage_1.stage_sort_by