正在显示
5 个修改的文件
包含
10 行增加
和
10 行删除
| @@ -269,7 +269,7 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua | @@ -269,7 +269,7 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua | ||
| 269 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 269 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 270 | } | 270 | } |
| 271 | if !param.IsTemporary { | 271 | if !param.IsTemporary { |
| 272 | - err = srv.AfterCompletedEvaluation360Hrbp(transactionContext, summaryEvaluation, itemValueList) | 272 | + err = srv.AfterCompletedEvaluation360Hrbp(transactionContext, summaryEvaluation, evaluationValueSlice) |
| 273 | if err != nil { | 273 | if err != nil { |
| 274 | return nil, err | 274 | return nil, err |
| 275 | } | 275 | } |
| @@ -277,7 +277,7 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua | @@ -277,7 +277,7 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua | ||
| 277 | if err := transactionContext.CommitTransaction(); err != nil { | 277 | if err := transactionContext.CommitTransaction(); err != nil { |
| 278 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 278 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 279 | } | 279 | } |
| 280 | - itemValueAdapter := srv.buildSummaryItemValue(itemList, itemValueList) | 280 | + itemValueAdapter := srv.buildSummaryItemValue(itemList, evaluationValueSlice) |
| 281 | return map[string][]adapter.EvaluationItemAdapter{ | 281 | return map[string][]adapter.EvaluationItemAdapter{ |
| 282 | "evaluationItems": itemValueAdapter, | 282 | "evaluationItems": itemValueAdapter, |
| 283 | }, nil | 283 | }, nil |
| @@ -400,7 +400,7 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu | @@ -400,7 +400,7 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu | ||
| 400 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 400 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 401 | } | 401 | } |
| 402 | if !param.IsTemporary { | 402 | if !param.IsTemporary { |
| 403 | - err = srv.AfterCompletedEvaluation360Hrbp(transactionContext, summaryEvaluation, itemValueList) | 403 | + err = srv.AfterCompletedEvaluation360Hrbp(transactionContext, summaryEvaluation, evaluationValueSlice) |
| 404 | if err != nil { | 404 | if err != nil { |
| 405 | return nil, err | 405 | return nil, err |
| 406 | } | 406 | } |
| @@ -409,7 +409,7 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu | @@ -409,7 +409,7 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu | ||
| 409 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 409 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 410 | } | 410 | } |
| 411 | 411 | ||
| 412 | - itemValueAdapter := srv.buildSummaryItemValue(itemList, itemValueList) | 412 | + itemValueAdapter := srv.buildSummaryItemValue(itemList, evaluationValueSlice) |
| 413 | return map[string][]adapter.EvaluationItemAdapter{ | 413 | return map[string][]adapter.EvaluationItemAdapter{ |
| 414 | "evaluationItems": itemValueAdapter, | 414 | "evaluationItems": itemValueAdapter, |
| 415 | }, nil | 415 | }, nil |
| @@ -341,7 +341,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva | @@ -341,7 +341,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva | ||
| 341 | } | 341 | } |
| 342 | } | 342 | } |
| 343 | if !param.IsTemporary { | 343 | if !param.IsTemporary { |
| 344 | - err = srv.AfterCompletedEvaluationSelf(transactionContext, evaluationData, itemValueList) | 344 | + err = srv.AfterCompletedEvaluationSelf(transactionContext, evaluationData, evaluationValueSlice) |
| 345 | if err != nil { | 345 | if err != nil { |
| 346 | return nil, err | 346 | return nil, err |
| 347 | } | 347 | } |
| @@ -349,7 +349,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva | @@ -349,7 +349,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva | ||
| 349 | if err := transactionContext.CommitTransaction(); err != nil { | 349 | if err := transactionContext.CommitTransaction(); err != nil { |
| 350 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 350 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 351 | } | 351 | } |
| 352 | - itemValueAdapter := srv.buildSummaryItemValue(itemList, itemValueList) | 352 | + itemValueAdapter := srv.buildSummaryItemValue(itemList, evaluationValueSlice) |
| 353 | return map[string][]adapter.EvaluationItemAdapter{ | 353 | return map[string][]adapter.EvaluationItemAdapter{ |
| 354 | "EvaluationItems": itemValueAdapter, | 354 | "EvaluationItems": itemValueAdapter, |
| 355 | }, nil | 355 | }, nil |
| @@ -462,7 +462,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval | @@ -462,7 +462,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval | ||
| 462 | } | 462 | } |
| 463 | } | 463 | } |
| 464 | if !param.IsTemporary { | 464 | if !param.IsTemporary { |
| 465 | - err = srv.AfterCompletedEvaluationSuper(transactionContext, evaluationData, itemValueList) | 465 | + err = srv.AfterCompletedEvaluationSuper(transactionContext, evaluationData, evaluationValueSlice) |
| 466 | if err != nil { | 466 | if err != nil { |
| 467 | return nil, err | 467 | return nil, err |
| 468 | } | 468 | } |
| @@ -471,7 +471,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval | @@ -471,7 +471,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval | ||
| 471 | if err := transactionContext.CommitTransaction(); err != nil { | 471 | if err := transactionContext.CommitTransaction(); err != nil { |
| 472 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 472 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 473 | } | 473 | } |
| 474 | - itemValueAdapter := srv.buildSummaryItemValue(itemList, itemValueList) | 474 | + itemValueAdapter := srv.buildSummaryItemValue(itemList, evaluationValueSlice) |
| 475 | return map[string][]adapter.EvaluationItemAdapter{ | 475 | return map[string][]adapter.EvaluationItemAdapter{ |
| 476 | "EvaluationItems": itemValueAdapter, | 476 | "EvaluationItems": itemValueAdapter, |
| 477 | }, nil | 477 | }, nil |
| @@ -9,8 +9,8 @@ import ( | @@ -9,8 +9,8 @@ import ( | ||
| 9 | func TestGenerateToken(t *testing.T) { | 9 | func TestGenerateToken(t *testing.T) { |
| 10 | ut := UserAuth{ | 10 | ut := UserAuth{ |
| 11 | CompanyId: 8, | 11 | CompanyId: 8, |
| 12 | - UserId: 3422174102828544, | ||
| 13 | - Phone: "17708397664", | 12 | + UserId: 3422052605249024, |
| 13 | + Phone: "13677777777", | ||
| 14 | PlatformId: 29, | 14 | PlatformId: 29, |
| 15 | AdminType: 1, | 15 | AdminType: 1, |
| 16 | } | 16 | } |
-
请 注册 或 登录 后发表评论