调整 TaskStageState 的值

@@ -7,7 +7,7 @@ type TaskInfoAdapter struct {
 	LeaderId          int64       `json:"leaderId,string"`   //
 	LeaderId          int64       `json:"leaderId,string"`   //
 	Leader            UserData    `json:"leader"`            // 任务负责人
 	Leader            UserData    `json:"leader"`            // 任务负责人
 	Status            int         `json:"status"`            // 任务的状态
 	Status            int         `json:"status"`            // 任务的状态
-	StatusDescript string      `json:"statusDescript"`  //
+	StatusDescription string      `json:"statusDescription"` //
 	Level             int         `json:"level"`             // 优先级,值越小优先级越高
 	Level             int         `json:"level"`             // 优先级,值越小优先级越高
 	LevalName         string      `json:"levalName"`         // 优先级名称
 	LevalName         string      `json:"levalName"`         // 优先级名称
 	RelatedUserId     []string    `json:"relatedUserId"`     // 相关的员工id
 	RelatedUserId     []string    `json:"relatedUserId"`     // 相关的员工id
@@ -24,7 +24,7 @@ type UserData struct {
 type TaskStage struct {
 type TaskStage struct {
 	Id                int    `json:"id,string"`
 	Id                int    `json:"id,string"`
 	Name              string `json:"name"`              //里程碑名称
 	Name              string `json:"name"`              //里程碑名称
-	StatusDescript  string `json:"statusDescript"` //里程碑的完成情况
+	StatusDescription string `json:"statusDescription"` //里程碑的完成情况
 	Status            int    `json:"status"`            //里程碑状态
 	Status            int    `json:"status"`            //里程碑状态
 	SortBy            int    `json:"sortBy"`
 	SortBy            int    `json:"sortBy"`
 	PlanCompletedAt   string `json:"planCompletedAt"` //计划完成时间, 例:2006-01-02
 	PlanCompletedAt   string `json:"planCompletedAt"` //计划完成时间, 例:2006-01-02

@@ -339,7 +339,7 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
 			Name:    taskData.Leader.Name,
 			Name:    taskData.Leader.Name,
 		},
 		},
 		Status:            int(taskData.Status),
 		Status:            int(taskData.Status),
-		StatusDescript: taskData.StatusDescript(),
+		StatusDescription: taskData.StatusDescription(),
 		Level:             taskData.Level,
 		Level:             taskData.Level,
 		LevalName:         taskData.LevelName,
 		LevalName:         taskData.LevelName,
 		RelatedUserId:     []string{},
 		RelatedUserId:     []string{},
@@ -371,7 +371,7 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
 			PlanCompletedAt:   t1,
 			PlanCompletedAt:   t1,
 			RealCompletedAt:   t2,
 			RealCompletedAt:   t2,
 			SortBy:            val.SortBy,
 			SortBy:            val.SortBy,
-			StatusDescript:  val.StatusDescript(),
+			StatusDescription: val.StatusDescription(),
 			Status:            int(val.Status),
 			Status:            int(val.Status),
 		})
 		})
 	}
 	}
@@ -533,7 +533,7 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte
 		stage := adapter.TaskStage{
 		stage := adapter.TaskStage{
 			Id:                val.Id,
 			Id:                val.Id,
 			Name:              val.Name,
 			Name:              val.Name,
-			StatusDescript: val.StatusDescript(),
+			StatusDescription: val.StatusDescription(),
 			Status:            int(val.Status),
 			Status:            int(val.Status),
 			SortBy:            val.SortBy,
 			SortBy:            val.SortBy,
 		}
 		}
@@ -638,6 +638,7 @@ func (t TaskService) ListTask2(param command.SearchTaskCommand) (map[string]inte
 	return nil, nil
 	return nil, nil
 }
 }
 
 
+// 以hrbp角色权限获取任务列表
 func (t TaskService) ListTask2ForHrbp(param command.SearchTaskCommand) (map[string]interface{}, error) {
 func (t TaskService) ListTask2ForHrbp(param command.SearchTaskCommand) (map[string]interface{}, error) {
 	return nil, nil
 	return nil, nil
 }
 }

@@ -36,6 +36,7 @@ type TaskLeader struct {
 }
 }
 
 
 // 设置任务的优先级
 // 设置任务的优先级
+// 值越小优先级越高,不是预定义的任务优先级,排在最后
 func (t *Task) ApplyLevelName(name string) {
 func (t *Task) ApplyLevelName(name string) {
 	t.LevelName = name
 	t.LevelName = name
 	switch name {
 	switch name {
@@ -51,7 +52,7 @@ func (t *Task) ApplyLevelName(name string) {
 }
 }
 
 
 // StatusDescript
 // StatusDescript
-func (t *Task) StatusDescript() string {
+func (t *Task) StatusDescription() string {
 	switch t.Status {
 	switch t.Status {
 	case TaskWait:
 	case TaskWait:
 		return "待启动"
 		return "待启动"

@@ -6,8 +6,8 @@ type TaskStageState int
 
 
 const (
 const (
 	TaskStageUncompleted TaskStageState = 1 //里程碑未完成
 	TaskStageUncompleted TaskStageState = 1 //里程碑未完成
-	TaskStageCompletedOverdue TaskStageState = 2 //里程碑逾期完成
-	TaskStageCompleted        TaskStageState = 3 //里程碑完成
+	// TaskStageCompletedOverdue TaskStageState = 2 //里程碑逾期完成
+	TaskStageCompleted TaskStageState = 2 //里程碑完成
 
 
 )
 )
 
 
@@ -32,7 +32,7 @@ type TaskStageRepository interface {
 }
 }
 
 
 // 描述里程碑完成情况
 // 描述里程碑完成情况
-func (t TaskStage) StatusDescript() string {
+func (t TaskStage) StatusDescription() string {
 	nowDay := time.Now().Format("2006-01-02")
 	nowDay := time.Now().Format("2006-01-02")
 	nowTime, _ := time.ParseInLocation("2006-01-02", nowDay, time.Local)
 	nowTime, _ := time.ParseInLocation("2006-01-02", nowDay, time.Local)
 
 
@@ -45,10 +45,11 @@ func (t TaskStage) StatusDescript() string {
 			str = "未完成"
 			str = "未完成"
 		}
 		}
 	case TaskStageCompleted:
 	case TaskStageCompleted:
+		if t.PlanCompletedAt >= t.RealCompletedAt {
 			str = "已完成"
 			str = "已完成"
-	case TaskStageCompletedOverdue:
+		} else {
 			str = "逾期完成"
 			str = "逾期完成"
 		}
 		}
-
+	}
 	return str
 	return str
 }
 }