正在显示
2 个修改的文件
包含
6 行增加
和
2 行删除
@@ -341,6 +341,9 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | @@ -341,6 +341,9 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | ||
341 | // defer func() { | 341 | // defer func() { |
342 | // _ = transactionContext.RollbackTransaction() | 342 | // _ = transactionContext.RollbackTransaction() |
343 | // }() | 343 | // }() |
344 | + log.Logger.Debug("CreateStaffAssessTask 获取参数", map[string]interface{}{ | ||
345 | + "param": param, | ||
346 | + }) | ||
344 | assessTaskRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{ | 347 | assessTaskRepo := factory.CreateStaffAssessTaskRepository(map[string]interface{}{ |
345 | "transactionContext": transactionContext, | 348 | "transactionContext": transactionContext, |
346 | }) | 349 | }) |
@@ -372,6 +375,7 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | @@ -372,6 +375,7 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | ||
372 | CreatedAt: nowTime, | 375 | CreatedAt: nowTime, |
373 | UpdatedAt: nowTime, | 376 | UpdatedAt: nowTime, |
374 | DeletedAt: nil, | 377 | DeletedAt: nil, |
378 | + BeginDay: taskBeginTime.Local().Format("2006-01-02"), | ||
375 | } | 379 | } |
376 | // } | 380 | // } |
377 | 381 | ||
@@ -425,6 +429,7 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | @@ -425,6 +429,7 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | ||
425 | 429 | ||
426 | if len(assassessTaskList) > 0 { | 430 | if len(assassessTaskList) > 0 { |
427 | //过滤就数据 | 431 | //过滤就数据 |
432 | + assessTaskData.Id = assassessTaskList[0].Id | ||
428 | for _, v := range assassessTaskList[0].ExecutorId { | 433 | for _, v := range assassessTaskList[0].ExecutorId { |
429 | if _, ok := executorIdMap[v]; ok { | 434 | if _, ok := executorIdMap[v]; ok { |
430 | continue | 435 | continue |
@@ -432,7 +437,6 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | @@ -432,7 +437,6 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat | ||
432 | executorIds = append(executorIds, v) | 437 | executorIds = append(executorIds, v) |
433 | } | 438 | } |
434 | assessTaskData.ExecutorId = executorIds | 439 | assessTaskData.ExecutorId = executorIds |
435 | - assessTaskData.Id = assassessTaskList[0].Id | ||
436 | assessTaskData.StepList = append(assassessTaskList[0].StepList, assessTaskData.StepList...) | 440 | assessTaskData.StepList = append(assassessTaskList[0].StepList, assessTaskData.StepList...) |
437 | 441 | ||
438 | } | 442 | } |
@@ -3,7 +3,7 @@ package domain | @@ -3,7 +3,7 @@ package domain | ||
3 | import "time" | 3 | import "time" |
4 | 4 | ||
5 | type User struct { | 5 | type User struct { |
6 | - Id int64 `json:"id"` // 用户Id | 6 | + Id int64 `json:"id,string"` // 用户Id |
7 | Account string `json:"account"` // 用户账号 | 7 | Account string `json:"account"` // 用户账号 |
8 | AvatarUrl string `json:"avatarUrl"` // 用户头像URL | 8 | AvatarUrl string `json:"avatarUrl"` // 用户头像URL |
9 | CompanyId int64 `json:"companyId"` // 公司编号 | 9 | CompanyId int64 `json:"companyId"` // 公司编号 |
-
请 注册 或 登录 后发表评论