...
|
...
|
@@ -531,7 +531,7 @@ func (taskService *TaskService) SearchOffTaskRecord(searchOffTaskRecordCommand * |
|
|
}); err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
} else {
|
|
|
var offTaskRecordDtos []*dto.OffTaskRecordDto
|
|
|
offTaskRecordDtos := make([]*dto.OffTaskRecordDto, 0)
|
|
|
for _, offTaskRecord := range offTaskRecords {
|
|
|
for _, task := range tasks {
|
|
|
if offTaskRecord.Task.TaskId == task.TaskId {
|
...
|
...
|
@@ -701,7 +701,7 @@ func (taskService *TaskService) SearchRejectTaskRecord(searchRejectTaskRecordCom |
|
|
}); err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
} else {
|
|
|
var rejectTaskRecordDtos []*dto.RejectTaskRecordDto
|
|
|
rejectTaskRecordDtos := make([]*dto.RejectTaskRecordDto, 0)
|
|
|
for _, rejectTaskRecord := range rejectTaskRecords {
|
|
|
for _, task := range tasks {
|
|
|
if rejectTaskRecord.Task.TaskId == task.TaskId {
|
...
|
...
|
@@ -718,8 +718,8 @@ func (taskService *TaskService) SearchRejectTaskRecord(searchRejectTaskRecordCom |
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
return map[string]interface{}{
|
|
|
"count": count,
|
|
|
"offTaskRecords": rejectTaskRecordDtos,
|
|
|
"count": count,
|
|
|
"rejectTaskRecords": rejectTaskRecordDtos,
|
|
|
}, nil
|
|
|
}
|
|
|
}
|
...
|
...
|
|