...
|
...
|
@@ -910,10 +910,14 @@ func (srv TaskService) ReplyTaskStage(transactionContext application.Transaction |
|
|
"transactionContext": transactionContext,
|
|
|
})
|
|
|
for _, val := range param {
|
|
|
taskData, err := taskRepo.FindOne(map[string]interface{}{"id": val.TaskId})
|
|
|
_, taskDataList, err := taskRepo.Find(map[string]interface{}{"id": val.TaskId})
|
|
|
if err != nil {
|
|
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "找不到任务数据"+err.Error())
|
|
|
}
|
|
|
if len(taskDataList) == 0 {
|
|
|
continue
|
|
|
}
|
|
|
taskData := taskDataList[0]
|
|
|
_, stageList, err := taskStageRepo.Find(map[string]interface{}{"taskId": []int{val.TaskId}})
|
|
|
if err != nil {
|
|
|
return application.ThrowError(application.INTERNAL_SERVER_ERROR, "找不到任务里程碑数据"+err.Error())
|
...
|
...
|
@@ -975,8 +979,13 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map |
|
|
}
|
|
|
|
|
|
resultList := []adapter.TaskRecordAdapter{}
|
|
|
nowDay := time.Now().Format("2006-01-02")
|
|
|
for _, val := range taskRecordList {
|
|
|
|
|
|
// 跳过今天
|
|
|
createdAtDay := val.CreatedAt.Local().Format("2006-01-02")
|
|
|
if createdAtDay == nowDay {
|
|
|
continue
|
|
|
}
|
|
|
item := adapter.TaskRecordAdapter{
|
|
|
Id: val.Id,
|
|
|
StaffAssessId: val.StaffAssessId,
|
...
|
...
|
@@ -995,7 +1004,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map |
|
|
PlanCompletedAt: "",
|
|
|
RealCompletedAt: "",
|
|
|
},
|
|
|
CreatedAt: val.CreatedAt.Local().Format("2006-01-02"),
|
|
|
CreatedAt: createdAtDay,
|
|
|
}
|
|
|
t1 := time.Unix(val.TaskStageCheck.PlanCompletedAt, 0).Local().Format("2006-01-02")
|
|
|
item.TaskStageCheck.PlanCompletedAt = t1
|
...
|
...
|
@@ -1190,6 +1199,7 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i |
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统计任务里程碑总数"+err.Error())
|
|
|
}
|
|
|
//反馈异常数
|
|
|
taskAnomalyCnt, err := taskDao.CountTaskAnomalyNotHrbp(condition)
|
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "统计任务里程碑总数"+err.Error())
|
...
|
...
|
|