作者 tangxvhui

调整 任务详情输出

@@ -16,9 +16,10 @@ type TaskInfoAdapter struct { @@ -16,9 +16,10 @@ type TaskInfoAdapter struct {
16 } 16 }
17 17
18 type UserData struct { 18 type UserData struct {
19 - Id int64 `json:"id,string"` // 用户Id  
20 - Account string `json:"account"` // 用户账号  
21 - Name string `json:"name"` // 用户姓名 19 + Id int64 `json:"id,string"` // 用户Id
  20 + ParentId int64 `json:"parentId,string"`
  21 + Account string `json:"account"` // 用户账号
  22 + Name string `json:"name"` // 用户姓名
22 } 23 }
23 24
24 type TaskStage struct { 25 type TaskStage struct {
@@ -109,7 +109,7 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont @@ -109,7 +109,7 @@ func (srv TaskService) CreateTask(transactionContext application.TransactionCont
109 Status: domain.TaskRunning, 109 Status: domain.TaskRunning,
110 Level: 0, 110 Level: 0,
111 LevelName: "", 111 LevelName: "",
112 - RelatedUser: []int{}, 112 + RelatedUser: []int{int(leaderData.Id), int(leaderData.ParentId)},
113 RunAt: nowTime.Unix(), 113 RunAt: nowTime.Unix(),
114 StopAt: 0, 114 StopAt: 0,
115 } 115 }
@@ -215,9 +215,22 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string] @@ -215,9 +215,22 @@ func (srv TaskService) UpdateTask(param *command.UpdateTaskCommand) (map[string]
215 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务的相关人员"+err.Error()) 215 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取任务的相关人员"+err.Error())
216 } 216 }
217 } 217 }
  218 + _, leaderList, err := userRepo.Find(map[string]interface{}{
  219 + "id": taskData.Leader.Id,
  220 + })
  221 + if err != nil {
  222 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "查询人员失败:"+err.Error())
  223 + }
  224 + if len(leaderList) == 0 {
  225 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有查询到人员")
  226 + }
  227 + leaderData := leaderList[0]
218 //更新相关人员 228 //更新相关人员
219 - taskData.RelatedUser = []int{} 229 + taskData.RelatedUser = []int{int(leaderData.Id), int(leaderData.ParentId)}
220 for _, val := range relatedUser { 230 for _, val := range relatedUser {
  231 + if val.Id == leaderData.Id || val.Id == leaderData.ParentId {
  232 + continue
  233 + }
221 taskData.RelatedUser = append(taskData.RelatedUser, int(val.Id)) 234 taskData.RelatedUser = append(taskData.RelatedUser, int(val.Id))
222 } 235 }
223 //更新任务名称 236 //更新任务名称
@@ -385,7 +398,16 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task @@ -385,7 +398,16 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
385 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取相关人员"+err.Error()) 398 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取相关人员"+err.Error())
386 } 399 }
387 } 400 }
388 - 401 + _, leaderDataList, err := userRepo.Find(map[string]interface{}{
  402 + "ids": taskData.Leader.Id,
  403 + })
  404 + if err != nil {
  405 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取相关人员"+err.Error())
  406 + }
  407 + var leaderData domain.User
  408 + if len(leaderDataList) > 0 {
  409 + leaderData = *leaderDataList[0]
  410 + }
389 //查询是否已经有每日评估 411 //查询是否已经有每日评估
390 taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{ 412 taskRecordRepo := factory.CreateTaskRecordRepository(map[string]interface{}{
391 "transactionContext": transactionContext, 413 "transactionContext": transactionContext,
@@ -407,9 +429,10 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task @@ -407,9 +429,10 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
407 Alias: taskData.Alias, 429 Alias: taskData.Alias,
408 LeaderId: taskData.Leader.Id, 430 LeaderId: taskData.Leader.Id,
409 Leader: adapter.UserData{ 431 Leader: adapter.UserData{
410 - Id: taskData.Leader.Id,  
411 - Account: taskData.Leader.Account,  
412 - Name: taskData.Leader.Name, 432 + Id: taskData.Leader.Id,
  433 + Account: taskData.Leader.Account,
  434 + Name: taskData.Leader.Name,
  435 + ParentId: leaderData.ParentId,
413 }, 436 },
414 Status: int(taskData.Status), 437 Status: int(taskData.Status),
415 StatusDescription: taskData.StatusDescription(), 438 StatusDescription: taskData.StatusDescription(),
@@ -423,9 +446,10 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task @@ -423,9 +446,10 @@ func (srv TaskService) GetTaskInfo(param *command.GetTaskCommand) (*adapter.Task
423 idStr := strconv.Itoa(int(val.Id)) 446 idStr := strconv.Itoa(int(val.Id))
424 result.RelatedUserId = append(result.RelatedUserId, idStr) 447 result.RelatedUserId = append(result.RelatedUserId, idStr)
425 result.RelatedUser = append(result.RelatedUser, adapter.UserData{ 448 result.RelatedUser = append(result.RelatedUser, adapter.UserData{
426 - Id: val.Id,  
427 - Account: val.Account,  
428 - Name: val.Name, 449 + Id: val.Id,
  450 + Account: val.Account,
  451 + Name: val.Name,
  452 + ParentId: val.ParentId,
429 }) 453 })
430 } 454 }
431 455