|
@@ -1237,7 +1237,12 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i |
|
@@ -1237,7 +1237,12 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i |
|
1237
|
if val.WarnFlag > 0 {
|
1237
|
if val.WarnFlag > 0 {
|
|
1238
|
tk.WarnFlag = 1
|
1238
|
tk.WarnFlag = 1
|
|
1239
|
}
|
1239
|
}
|
|
|
|
1240
|
+ if val.LastStage.Id > 0 && val.LastStage.PlanCompletedAt < val.LastStage.RealCompletedAt {
|
|
|
|
1241
|
+ //上一个里程碑超期完成
|
|
|
|
1242
|
+ tk.WarnFlag = 1
|
|
|
|
1243
|
+ }
|
|
1240
|
if val.CurrentStage.Id == 0 {
|
1244
|
if val.CurrentStage.Id == 0 {
|
|
|
|
1245
|
+ //里程碑已全部完成
|
|
1241
|
tk.WarnFlag = 0
|
1246
|
tk.WarnFlag = 0
|
|
1242
|
}
|
1247
|
}
|
|
1243
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{
|
1248
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{
|
|
@@ -1534,15 +1539,14 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s |
|
@@ -1534,15 +1539,14 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s |
|
1534
|
if tk.WarnFlag > 0 {
|
1539
|
if tk.WarnFlag > 0 {
|
|
1535
|
tk.WarnFlag = 1
|
1540
|
tk.WarnFlag = 1
|
|
1536
|
}
|
1541
|
}
|
|
|
|
1542
|
+ if val.LastStage.Id > 0 && val.LastStage.PlanCompletedAt < val.LastStage.RealCompletedAt {
|
|
|
|
1543
|
+ //上一个里程碑超期完成
|
|
|
|
1544
|
+ tk.WarnFlag = 1
|
|
|
|
1545
|
+ }
|
|
1537
|
if val.CurrentStage.Id == 0 {
|
1546
|
if val.CurrentStage.Id == 0 {
|
|
|
|
1547
|
+ //里程已全部完成
|
|
1538
|
tk.WarnFlag = 0
|
1548
|
tk.WarnFlag = 0
|
|
1539
|
}
|
1549
|
}
|
|
1540
|
- // if val.LastStage.Id > 0 && val.LastStage.PlanCompletedAt < val.LastStage.RealCompletedAt {
|
|
|
|
1541
|
- // tk.WarnFlag = int(domain.TaskWarn)
|
|
|
|
1542
|
- // }
|
|
|
|
1543
|
- // if val.CurrentStage.Id > 0 && val.CurrentStage.PlanCompletedAt < nowTime {
|
|
|
|
1544
|
- // tk.WarnFlag = int(domain.TaskWarn)
|
|
|
|
1545
|
- // }
|
|
|
|
1546
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{
|
1550
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{
|
|
1547
|
"taskId": val.TaskId,
|
1551
|
"taskId": val.TaskId,
|
|
1548
|
})
|
1552
|
})
|