|
@@ -596,6 +596,11 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte |
|
@@ -596,6 +596,11 @@ func (srv TaskService) ListTask(param *command.ListTaskCommand) (map[string]inte |
|
596
|
Name: val.Name,
|
596
|
Name: val.Name,
|
|
597
|
StatusDescription: val.StatusDescription(),
|
597
|
StatusDescription: val.StatusDescription(),
|
|
598
|
SortBy: val.SortBy,
|
598
|
SortBy: val.SortBy,
|
|
|
|
599
|
+ PlanCompletedAt: time.Unix(int64(val.PlanCompletedAt), 0).Local().Format("2006-01-02"),
|
|
|
|
600
|
+ RealCompletedAt: "",
|
|
|
|
601
|
+ }
|
|
|
|
602
|
+ if val.RealCompletedAt > 0 {
|
|
|
|
603
|
+ stage.RealCompletedAt = time.Unix(int64(val.RealCompletedAt), 0).Local().Format("2006-01-02")
|
|
599
|
}
|
604
|
}
|
|
600
|
switch val.SortBy {
|
605
|
switch val.SortBy {
|
|
601
|
case 1:
|
606
|
case 1:
|
|
@@ -887,10 +892,9 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction |
|
@@ -887,10 +892,9 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction |
|
887
|
if err != nil {
|
892
|
if err != nil {
|
|
888
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "找不到任务数据"+err.Error())
|
893
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "找不到任务数据"+err.Error())
|
|
889
|
}
|
894
|
}
|
|
890
|
-
|
|
|
|
891
|
- if !(len(val.AssistContent) == 0 || val.AssistContent == "无") {
|
|
|
|
892
|
- taskData.Anomaly = 0
|
|
|
|
893
|
- }
|
895
|
+ // if !(len(val.AssistContent) == 0 || val.AssistContent == "无") {
|
|
|
|
896
|
+ // taskData.Anomaly = 0
|
|
|
|
897
|
+ // }
|
|
894
|
taskList = append(taskList, taskData)
|
898
|
taskList = append(taskList, taskData)
|
|
895
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{"ids": []int{val.TaskStageCheck.Id}})
|
899
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{"ids": []int{val.TaskStageCheck.Id}})
|
|
896
|
if err != nil {
|
900
|
if err != nil {
|