|
@@ -861,18 +861,14 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction |
|
@@ -861,18 +861,14 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction |
|
861
|
}
|
861
|
}
|
|
862
|
|
862
|
|
|
863
|
//改为定时检查每日任务反馈,并计算反馈异常数
|
863
|
//改为定时检查每日任务反馈,并计算反馈异常数
|
|
864
|
- // for _, val2 := range stageList {
|
|
|
|
865
|
- // if val2.Id != val.TaskStageCheck.Id {
|
|
|
|
866
|
- // continue
|
|
|
|
867
|
- // }
|
|
|
|
868
|
- // val2.RealCompletedAt = val.TaskStageCheck.RealCompletedAt
|
|
|
|
869
|
- // if val2.PlanCompletedAt < val2.RealCompletedAt {
|
|
|
|
870
|
- // taskData.WarnFlag = 1
|
|
|
|
871
|
- // } else {
|
|
|
|
872
|
- // taskData.WarnFlag = 0
|
|
|
|
873
|
- // }
|
|
|
|
874
|
- // break
|
|
|
|
875
|
- // }
|
864
|
+ //这边仅记录 里程碑的完成情况
|
|
|
|
865
|
+ for _, val2 := range stageList {
|
|
|
|
866
|
+ if val2.Id != val.TaskStageCheck.Id {
|
|
|
|
867
|
+ continue
|
|
|
|
868
|
+ }
|
|
|
|
869
|
+ val2.RealCompletedAt = val.TaskStageCheck.RealCompletedAt
|
|
|
|
870
|
+ break
|
|
|
|
871
|
+ }
|
|
876
|
err = taskStageRepo.Save(stageList)
|
872
|
err = taskStageRepo.Save(stageList)
|
|
877
|
if err != nil {
|
873
|
if err != nil {
|
|
878
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存任务里程碑数据"+err.Error())
|
874
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存任务里程碑数据"+err.Error())
|
|
@@ -966,9 +962,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map |
|
@@ -966,9 +962,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map |
|
966
|
//}
|
962
|
//}
|
|
967
|
resultList = append(resultList, item)
|
963
|
resultList = append(resultList, item)
|
|
968
|
}
|
964
|
}
|
|
969
|
- //if err := transactionContext.CommitTransaction(); err != nil {
|
|
|
|
970
|
- // return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
|
971
|
- //}
|
965
|
+
|
|
972
|
result := tool_funs.SimpleWrapGridMap(int64(cnt), resultList)
|
966
|
result := tool_funs.SimpleWrapGridMap(int64(cnt), resultList)
|
|
973
|
return result, nil
|
967
|
return result, nil
|
|
974
|
}
|
968
|
}
|