正在显示
1 个修改的文件
包含
4 行增加
和
1 行删除
| @@ -524,7 +524,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. | @@ -524,7 +524,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. | ||
| 524 | // TargetUser: domain.StaffDesc{}, | 524 | // TargetUser: domain.StaffDesc{}, |
| 525 | // TargetDepartment: nil, | 525 | // TargetDepartment: nil, |
| 526 | // Executor: domain.StaffDesc{}, | 526 | // Executor: domain.StaffDesc{}, |
| 527 | - Types: domain.AssessSelf, | 527 | + Types: "", |
| 528 | // LinkNodeId: v.LinkNodeId, | 528 | // LinkNodeId: v.LinkNodeId, |
| 529 | Status: domain.StaffAssessUncompleted, | 529 | Status: domain.StaffAssessUncompleted, |
| 530 | // BeginTime: time.Time{}, | 530 | // BeginTime: time.Time{}, |
| @@ -540,6 +540,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. | @@ -540,6 +540,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. | ||
| 540 | stepSelfTemp.EndTime = v.EndTime | 540 | stepSelfTemp.EndTime = v.EndTime |
| 541 | stepSelfTemp.LinkNodeId = v.LinkNodeId | 541 | stepSelfTemp.LinkNodeId = v.LinkNodeId |
| 542 | stepSelfTemp.LinkNodeName = v.LinkNodeName | 542 | stepSelfTemp.LinkNodeName = v.LinkNodeName |
| 543 | + stepSelfTemp.Types = domain.AssessSelf | ||
| 543 | assessListTemp := srv.createStaffAssessSelf(stepSelfTemp, userList, userDepartmentMap) | 544 | assessListTemp := srv.createStaffAssessSelf(stepSelfTemp, userList, userDepartmentMap) |
| 544 | assessList = append(assessList, assessListTemp...) | 545 | assessList = append(assessList, assessListTemp...) |
| 545 | } | 546 | } |
| @@ -549,6 +550,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. | @@ -549,6 +550,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. | ||
| 549 | stepSelfTemp.EndTime = v.EndTime | 550 | stepSelfTemp.EndTime = v.EndTime |
| 550 | stepSelfTemp.LinkNodeId = v.LinkNodeId | 551 | stepSelfTemp.LinkNodeId = v.LinkNodeId |
| 551 | stepSelfTemp.LinkNodeName = v.LinkNodeName | 552 | stepSelfTemp.LinkNodeName = v.LinkNodeName |
| 553 | + stepSelfTemp.Types = domain.AssessSuper | ||
| 552 | assessListTemp, err := srv.createStaffAssessSupper(transactionContext, stepSelfTemp, userList, userDepartmentMap) | 554 | assessListTemp, err := srv.createStaffAssessSupper(transactionContext, stepSelfTemp, userList, userDepartmentMap) |
| 553 | if err != nil { | 555 | if err != nil { |
| 554 | return nil, err | 556 | return nil, err |
| @@ -564,6 +566,7 @@ func (srv StaffAssessServeice) createStaffAssessSelf(assessTemp domain.StaffAsse | @@ -564,6 +566,7 @@ func (srv StaffAssessServeice) createStaffAssessSelf(assessTemp domain.StaffAsse | ||
| 564 | userList []*domain.User, userDepartmentMap map[int64][]*domain.Department) []domain.StaffAssess { | 566 | userList []*domain.User, userDepartmentMap map[int64][]*domain.Department) []domain.StaffAssess { |
| 565 | result := []domain.StaffAssess{} | 567 | result := []domain.StaffAssess{} |
| 566 | for _, usr := range userList { | 568 | for _, usr := range userList { |
| 569 | + | ||
| 567 | assessTemp.TargetUser = domain.StaffDesc{ | 570 | assessTemp.TargetUser = domain.StaffDesc{ |
| 568 | UserId: int(usr.Id), | 571 | UserId: int(usr.Id), |
| 569 | Account: usr.Account, | 572 | Account: usr.Account, |
-
请 注册 或 登录 后发表评论