|
@@ -92,7 +92,6 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
@@ -92,7 +92,6 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
92
|
}
|
92
|
}
|
|
93
|
leaderData := leaderList[0]
|
93
|
leaderData := leaderList[0]
|
|
94
|
nowTime := time.Now()
|
94
|
nowTime := time.Now()
|
|
95
|
- nowEndTime := dayEndTime(nowTime)
|
|
|
|
96
|
newTask := domain.Task{
|
95
|
newTask := domain.Task{
|
|
97
|
Id: 0,
|
96
|
Id: 0,
|
|
98
|
CreatedAt: time.Time{},
|
97
|
CreatedAt: time.Time{},
|
|
@@ -112,6 +111,7 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
@@ -112,6 +111,7 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
112
|
RelatedUser: []int{int(leaderData.Id)},
|
111
|
RelatedUser: []int{int(leaderData.Id)},
|
|
113
|
RunAt: nowTime.Unix(),
|
112
|
RunAt: nowTime.Unix(),
|
|
114
|
StopAt: 0,
|
113
|
StopAt: 0,
|
|
|
|
114
|
+ SortBy: domain.TaskSortNull,
|
|
115
|
}
|
115
|
}
|
|
116
|
if int(leaderData.ParentId) != 0 {
|
116
|
if int(leaderData.ParentId) != 0 {
|
|
117
|
newTask.RelatedUser = append(newTask.RelatedUser, int(leaderData.ParentId))
|
117
|
newTask.RelatedUser = append(newTask.RelatedUser, int(leaderData.ParentId))
|
|
@@ -122,30 +122,30 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
@@ -122,30 +122,30 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont |
|
122
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "创建任务失败:"+err.Error())
|
122
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "创建任务失败:"+err.Error())
|
|
123
|
}
|
123
|
}
|
|
124
|
newTaskStage := []*domain.TaskStage{
|
124
|
newTaskStage := []*domain.TaskStage{
|
|
125
|
- {
|
|
|
|
126
|
- Id: 0,
|
|
|
|
127
|
- TaskId: newTask.Id,
|
|
|
|
128
|
- Name: "里程碑1",
|
|
|
|
129
|
- SortBy: 1,
|
|
|
|
130
|
- PlanCompletedAt: nowEndTime.Add(30 * 24 * time.Hour).Unix(),
|
|
|
|
131
|
- RealCompletedAt: 0,
|
|
|
|
132
|
- },
|
|
|
|
133
|
- {
|
|
|
|
134
|
- Id: 0,
|
|
|
|
135
|
- TaskId: newTask.Id,
|
|
|
|
136
|
- Name: "里程碑2",
|
|
|
|
137
|
- SortBy: 2,
|
|
|
|
138
|
- PlanCompletedAt: nowEndTime.Add(60 * 24 * time.Hour).Unix(),
|
|
|
|
139
|
- RealCompletedAt: 0,
|
|
|
|
140
|
- },
|
|
|
|
141
|
- {
|
|
|
|
142
|
- Id: 0,
|
|
|
|
143
|
- TaskId: newTask.Id,
|
|
|
|
144
|
- Name: "里程碑3",
|
|
|
|
145
|
- SortBy: 3,
|
|
|
|
146
|
- PlanCompletedAt: nowEndTime.Add(90 * 24 * time.Hour).Unix(),
|
|
|
|
147
|
- RealCompletedAt: 0,
|
|
|
|
148
|
- },
|
125
|
+ // {
|
|
|
|
126
|
+ // Id: 0,
|
|
|
|
127
|
+ // TaskId: newTask.Id,
|
|
|
|
128
|
+ // Name: "里程碑1",
|
|
|
|
129
|
+ // SortBy: 1,
|
|
|
|
130
|
+ // PlanCompletedAt: nowEndTime.Add(30 * 24 * time.Hour).Unix(),
|
|
|
|
131
|
+ // RealCompletedAt: 0,
|
|
|
|
132
|
+ // },
|
|
|
|
133
|
+ // {
|
|
|
|
134
|
+ // Id: 0,
|
|
|
|
135
|
+ // TaskId: newTask.Id,
|
|
|
|
136
|
+ // Name: "里程碑2",
|
|
|
|
137
|
+ // SortBy: 2,
|
|
|
|
138
|
+ // PlanCompletedAt: nowEndTime.Add(60 * 24 * time.Hour).Unix(),
|
|
|
|
139
|
+ // RealCompletedAt: 0,
|
|
|
|
140
|
+ // },
|
|
|
|
141
|
+ // {
|
|
|
|
142
|
+ // Id: 0,
|
|
|
|
143
|
+ // TaskId: newTask.Id,
|
|
|
|
144
|
+ // Name: "里程碑3",
|
|
|
|
145
|
+ // SortBy: 3,
|
|
|
|
146
|
+ // PlanCompletedAt: nowEndTime.Add(90 * 24 * time.Hour).Unix(),
|
|
|
|
147
|
+ // RealCompletedAt: 0,
|
|
|
|
148
|
+ // },
|
|
149
|
}
|
149
|
}
|
|
150
|
err = taskStageRepo.Save(newTaskStage)
|
150
|
err = taskStageRepo.Save(newTaskStage)
|
|
151
|
if err != nil {
|
151
|
if err != nil {
|