|
@@ -1235,17 +1235,11 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i |
|
@@ -1235,17 +1235,11 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i |
1235
|
tk.CurrentStage.RealCompletedAt = time.Unix(int64(val.CurrentStage.RealCompletedAt), 0).Local().Format("2006-01-02")
|
1235
|
tk.CurrentStage.RealCompletedAt = time.Unix(int64(val.CurrentStage.RealCompletedAt), 0).Local().Format("2006-01-02")
|
1236
|
}
|
1236
|
}
|
1237
|
if val.WarnFlag > 0 {
|
1237
|
if val.WarnFlag > 0 {
|
1238
|
- val.WarnFlag = 1
|
1238
|
+ tk.WarnFlag = 1
|
1239
|
}
|
1239
|
}
|
1240
|
if val.CurrentStage.Id == 0 {
|
1240
|
if val.CurrentStage.Id == 0 {
|
1241
|
tk.WarnFlag = 0
|
1241
|
tk.WarnFlag = 0
|
1242
|
}
|
1242
|
}
|
1243
|
- // if val.LastStage.Id > 0 && val.LastStage.PlanCompletedAt < val.LastStage.RealCompletedAt {
|
|
|
1244
|
- // tk.WarnFlag = int(domain.TaskWarn)
|
|
|
1245
|
- // }
|
|
|
1246
|
- // if val.CurrentStage.Id > 0 && val.CurrentStage.PlanCompletedAt < nowTime {
|
|
|
1247
|
- // tk.WarnFlag = int(domain.TaskWarn)
|
|
|
1248
|
- // }
|
|
|
1249
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{
|
1243
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{
|
1250
|
"taskId": val.TaskId,
|
1244
|
"taskId": val.TaskId,
|
1251
|
})
|
1245
|
})
|