暂存

@@ -22,6 +22,7 @@ type UserData struct {
 type TaskStage struct {
 type TaskStage struct {
 	Id              int    `json:"id"`
 	Id              int    `json:"id"`
 	Name            string `json:"name"`            //里程碑名称
 	Name            string `json:"name"`            //里程碑名称
+	StatusCompleted string `json:"statusCompleted"` //里程碑的完成情况
 	PlanCompletedAt string `json:"planCompletedAt"` //计划完成时间, 例:2006-01-02
 	PlanCompletedAt string `json:"planCompletedAt"` //计划完成时间, 例:2006-01-02
-
+	RealCompletedAt string `json:"realCompletedAt"` //实际完成时间, 例:2006-01-02
 }
 }

@@ -14,6 +14,11 @@ import (
 
 
 type TaskService struct{}
 type TaskService struct{}
 
 
+func NewTaskService() *TaskService {
+	newService := &TaskService{}
+	return newService
+}
+
 func dayEndTime(t time.Time) time.Time {
 func dayEndTime(t time.Time) time.Time {
 	y, m, d := t.Local().Date()
 	y, m, d := t.Local().Date()
 	t2 := time.Date(y, m, d, 23, 59, 59, 0, time.Local)
 	t2 := time.Date(y, m, d, 23, 59, 59, 0, time.Local)
@@ -35,6 +40,7 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询任务失败:"+err.Error())
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询任务失败:"+err.Error())
 	}
 	}
 	if cnt > 0 {
 	if cnt > 0 {
+		//TODO
 		//任务已存在
 		//任务已存在
 		return nil
 		return nil
 	}
 	}
@@ -64,8 +70,8 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont
 			Name:            "里程碑1",
 			Name:            "里程碑1",
 			SortBy:          1,
 			SortBy:          1,
 			Status:          domain.TaskStageUncompleted,
 			Status:          domain.TaskStageUncompleted,
-			PlanCompletedAt: nowEndTime.Add(30 * 24 * time.Hour).Unix(),
-			RealCompletedAt: 0,
+			PlanCompletedAt: nowEndTime.Add(30 * 24 * time.Hour).Format("2006-01-02"),
+			RealCompletedAt: "",
 		},
 		},
 		{
 		{
 			Id:              0,
 			Id:              0,
@@ -73,8 +79,8 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont
 			Name:            "里程碑2",
 			Name:            "里程碑2",
 			SortBy:          2,
 			SortBy:          2,
 			Status:          domain.TaskStageUncompleted,
 			Status:          domain.TaskStageUncompleted,
-			PlanCompletedAt: nowEndTime.Add(60 * 24 * time.Hour).Unix(),
-			RealCompletedAt: 0,
+			PlanCompletedAt: nowEndTime.Add(60 * 24 * time.Hour).Format("2006-01-02"),
+			RealCompletedAt: "",
 		},
 		},
 		{
 		{
 			Id:              0,
 			Id:              0,
@@ -82,8 +88,8 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont
 			Name:            "里程碑3",
 			Name:            "里程碑3",
 			SortBy:          3,
 			SortBy:          3,
 			Status:          domain.TaskStageUncompleted,
 			Status:          domain.TaskStageUncompleted,
-			PlanCompletedAt: nowEndTime.Add(90 * 24 * time.Hour).Unix(),
-			RealCompletedAt: 0,
+			PlanCompletedAt: nowEndTime.Add(90 * 24 * time.Hour).Format("2006-01-02"),
+			RealCompletedAt: "",
 		},
 		},
 	}
 	}
 	err = taskStageRepo.Save(newTaskStage)
 	err = taskStageRepo.Save(newTaskStage)
@@ -166,8 +172,8 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string]
 				Name:            val2.Name,
 				Name:            val2.Name,
 				SortBy:          i + 1,
 				SortBy:          i + 1,
 				Status:          domain.TaskStageUncompleted,
 				Status:          domain.TaskStageUncompleted,
-				PlanCompletedAt: t.Unix(),
-				RealCompletedAt: 0,
+				PlanCompletedAt: val2.PlanCompletedAt,
+				RealCompletedAt: "",
 			}
 			}
 			newStageList = append(newStageList, &newStage)
 			newStageList = append(newStageList, &newStage)
 			continue
 			continue
@@ -178,7 +184,7 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string]
 		}
 		}
 		oldStage.DeletedAt = nil
 		oldStage.DeletedAt = nil
 		oldStage.SortBy = i + 1
 		oldStage.SortBy = i + 1
-		oldStage.PlanCompletedAt = t.Unix()
+		oldStage.PlanCompletedAt = val2.PlanCompletedAt
 		oldStage.Name = val2.Name
 		oldStage.Name = val2.Name
 	}
 	}
 	stageList = append(stageList, newStageList...)
 	stageList = append(stageList, newStageList...)
@@ -270,14 +276,11 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
 		})
 		})
 	}
 	}
 	for _, val := range stageList {
 	for _, val := range stageList {
-		var t string
-		if val.PlanCompletedAt > 0 {
-			t = time.Unix(val.PlanCompletedAt, 0).Local().Format("2006-01-02")
-		}
 		result.StageList = append(result.StageList, adapter.TaskStage{
 		result.StageList = append(result.StageList, adapter.TaskStage{
 			Id:              val.Id,
 			Id:              val.Id,
 			Name:            val.Name,
 			Name:            val.Name,
-			PlanCompletedAt: t,
+			PlanCompletedAt: val.PlanCompletedAt,
+			RealCompletedAt: val.RealCompletedAt,
 		})
 		})
 	}
 	}
 	return &result, nil
 	return &result, nil
@@ -411,11 +414,47 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte
 	}
 	}
 
 
 	taskResult := []*adapter.TaskItem{}
 	taskResult := []*adapter.TaskItem{}
-	_ = stageList
-	// taskMapResult := map[int]*adapter.TaskItem{}
-	// for _, val := range taskList {
-
-	// }
+	taskMapResult := map[int]*adapter.TaskItem{}
+	for _, val := range taskList {
+		tk := adapter.TaskItem{
+			Id:    val.Id,
+			Name:  val.Name,
+			Alias: val.Alias,
+			Leader: adapter.UserData{
+				Id:      val.Leader.Id,
+				Account: val.Leader.Account,
+				Name:    val.Leader.Name,
+			},
+			Status:    int(val.Status),
+			Level:     val.Level,
+			LevalName: val.LevalName,
+			StageA:    "",
+			StageB:    "",
+			StageC:    "",
+			StageD:    "",
+			StageE:    "",
+		}
+		taskResult = append(taskResult, &tk)
+		taskMapResult[val.Id] = &tk
+	}
+	for _, val := range stageList {
+		taskData, ok := taskMapResult[val.TaskId]
+		if !ok {
+			continue
+		}
+		switch val.SortBy {
+		case 1:
+			taskData.StageA = val.Name
+		case 2:
+			taskData.StageB = val.Name
+		case 3:
+			taskData.StageC = val.Name
+		case 4:
+			taskData.StageD = val.Name
+		case 5:
+			taskData.StageE = val.Name
+		}
+	}
 	result := tool_funs.SimpleWrapGridMap(int64(taskCnt), taskResult)
 	result := tool_funs.SimpleWrapGridMap(int64(taskCnt), taskResult)
 	return result, nil
 	return result, nil
 }
 }

@@ -19,8 +19,8 @@ type TaskStage struct {
 	Name            string         `json:"name"`            //里程碑名称
 	Name            string         `json:"name"`            //里程碑名称
 	SortBy          int            `json:"sortBy"`          //排序
 	SortBy          int            `json:"sortBy"`          //排序
 	Status          TaskStageState `json:"status"`          //里程碑完成情况
 	Status          TaskStageState `json:"status"`          //里程碑完成情况
-	PlanCompletedAt int64          `json:"planCompletedAt"` //计划完成时间戳,秒
-	RealCompletedAt int64          `json:"realCompletedAt"` //时间完成时间戳,秒
+	PlanCompletedAt string         `json:"planCompletedAt"` //计划完成时间戳,秒
+	RealCompletedAt string         `json:"realCompletedAt"` //时间完成时间戳,秒
 }
 }
 type TaskStageRepository interface {
 type TaskStageRepository interface {
 	Save(param []*TaskStage) error
 	Save(param []*TaskStage) error
@@ -28,3 +28,13 @@ type TaskStageRepository interface {
 	FindOne(queryOptions map[string]interface{}) (*TaskStage, error)
 	FindOne(queryOptions map[string]interface{}) (*TaskStage, error)
 	Find(queryOptions map[string]interface{}) (int, []*TaskStage, error)
 	Find(queryOptions map[string]interface{}) (int, []*TaskStage, error)
 }
 }
+
+// 描述里程碑完成情况
+func (t TaskStage) DescriptStatus() string {
+	// nowTime := time.Now().Unix()
+	// if t.RealCompletedAt != "" && t.PlanCompletedAt != "" {
+
+	// }
+
+	return ""
+}

@@ -13,6 +13,6 @@ type TaskStage struct {
 	Name            string     `pg:"name"`              //里程碑名称
 	Name            string     `pg:"name"`              //里程碑名称
 	SortBy          int        `pg:"sort_by"`           //排序
 	SortBy          int        `pg:"sort_by"`           //排序
 	Status          int        `pg:"status"`            //里程碑完成情况
 	Status          int        `pg:"status"`            //里程碑完成情况
-	PlanCompletedAt int64      `pg:"plan_completed_at"` //计划完成时间
-	RealCompletedAt int64      `pg:"real_completed_at"` //时间完成时间
+	PlanCompletedAt string     `pg:"plan_completed_at"` //计划完成时间
+	RealCompletedAt string     `pg:"real_completed_at"` //时间完成时间
 }
 }

+package controllers
+
+import (
+	"github.com/linmadan/egglib-go/core/application"
+	"github.com/linmadan/egglib-go/web/beego"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/task/command"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/task/service"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/port/beego/middlewares"
+)
+
+type TaskController struct {
+	beego.BaseController
+}
+
+func (c *TaskController) GetTaskInfo() {
+	srv := service.NewTaskService()
+	paramReq := &command.GetTaskCommand{}
+	err := c.BindJSON(paramReq)
+	if err != nil {
+		e := application.ThrowError(application.ARG_ERROR, "json 解析错误"+err.Error())
+		c.Response(nil, e)
+		return
+	}
+	userReq := middlewares.GetUser(c.Ctx)
+
+	paramReq.CompanyId = int(userReq.CompanyId)
+	data, err := srv.GetTaskInfo(paramReq)
+	c.Response(data, err)
+}

+package routers
+
+import (
+	"github.com/beego/beego/v2/server/web"
+	"github.com/linmadan/egglib-go/web/beego/filters"
+	"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/port/beego/middlewares"
+)
+
+func init() {
+	//绩效管理模块
+	taskAdminNS := web.NewNamespace("/v1/admin/task",
+		web.NSBefore(filters.AllowCors(), middlewares.CheckAdminToken()))
+	web.AddNamespace(taskAdminNS)
+
+	taskFontNS := web.NewNamespace("/v1/font/task",
+		web.NSBefore(filters.AllowCors(), middlewares.CheckFontToken()))
+	web.AddNamespace(taskFontNS)
+}