作者 Your Name

更新数据

@@ -331,16 +331,16 @@ func (srv StaffAssessServeice) AssessSelfList(param *query.AssessSelfListQuery) @@ -331,16 +331,16 @@ func (srv StaffAssessServeice) AssessSelfList(param *query.AssessSelfListQuery)
331 331
332 // 根据项目评估的配置,创建员工的评估任务 332 // 根据项目评估的配置,创建员工的评估任务
333 func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext application.TransactionContext, param *command.CreateStaffAssessTask) (map[string]interface{}, error) { 333 func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext application.TransactionContext, param *command.CreateStaffAssessTask) (map[string]interface{}, error) {
334 - // transactionContext, err := factory.CreateTransactionContext(nil)  
335 - // if err != nil {  
336 - // return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())  
337 - // }  
338 - // if err := transactionContext.StartTransaction(); err != nil {  
339 - // return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())  
340 - // }  
341 - // defer func() {  
342 - // _ = transactionContext.RollbackTransaction()  
343 - // }() 334 + transactionContext, err := factory.CreateTransactionContext(nil)
  335 + if err != nil {
  336 + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
  337 + }
  338 + if err := transactionContext.StartTransaction(); err != nil {
  339 + return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
  340 + }
  341 + defer func() {
  342 + _ = transactionContext.RollbackTransaction()
  343 + }()
344 log.Logger.Debug("CreateStaffAssessTask 获取参数", map[string]interface{}{ 344 log.Logger.Debug("CreateStaffAssessTask 获取参数", map[string]interface{}{
345 "param": param, 345 "param": param,
346 }) 346 })
@@ -356,10 +356,6 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat @@ -356,10 +356,6 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat
356 return nil, application.ThrowError(application.ARG_ERROR, "任务结束时间填写错误,"+param.EndTime) 356 return nil, application.ThrowError(application.ARG_ERROR, "任务结束时间填写错误,"+param.EndTime)
357 } 357 }
358 nowTime := time.Now() 358 nowTime := time.Now()
359 - // if len(assassessTaskList) > 0 {  
360 - // assessTaskData = assassessTaskList[0]  
361 - // assessTaskData.UpdatedAt = nowTime  
362 - // } else {  
363 //建立评估任务 359 //建立评估任务
364 assessTaskData := &domain.StaffAssessTask{ 360 assessTaskData := &domain.StaffAssessTask{
365 Id: 0, 361 Id: 0,
@@ -458,9 +454,9 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat @@ -458,9 +454,9 @@ func (srv StaffAssessServeice) CreateStaffAssessTask(transactionContext applicat
458 } 454 }
459 } 455 }
460 456
461 - // if err := transactionContext.CommitTransaction(); err != nil {  
462 - // return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
463 - // } 457 + if err := transactionContext.CommitTransaction(); err != nil {
  458 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  459 + }
464 return map[string]interface{}{ 460 return map[string]interface{}{
465 "assessTaskId": assessTaskData.Id, 461 "assessTaskId": assessTaskData.Id,
466 }, nil 462 }, nil
@@ -551,11 +547,11 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. @@ -551,11 +547,11 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application.
551 stepSelfTemp.LinkNodeId = v.LinkNodeId 547 stepSelfTemp.LinkNodeId = v.LinkNodeId
552 stepSelfTemp.LinkNodeName = v.LinkNodeName 548 stepSelfTemp.LinkNodeName = v.LinkNodeName
553 stepSelfTemp.Types = domain.AssessSuper 549 stepSelfTemp.Types = domain.AssessSuper
554 - assessListTemp, err := srv.createStaffAssessSupper(transactionContext, stepSelfTemp, userList, userDepartmentMap) 550 + assessListTemp2, err := srv.createStaffAssessSupper(transactionContext, stepSelfTemp, userList, userDepartmentMap)
555 if err != nil { 551 if err != nil {
556 return nil, err 552 return nil, err
557 } 553 }
558 - assessList = append(assessList, assessListTemp...) 554 + assessList = append(assessList, assessListTemp2...)
559 } 555 }
560 } 556 }
561 return assessList, nil 557 return assessList, nil