...
|
...
|
@@ -524,7 +524,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. |
|
|
// TargetUser: domain.StaffDesc{},
|
|
|
// TargetDepartment: nil,
|
|
|
// Executor: domain.StaffDesc{},
|
|
|
Types: domain.AssessSelf,
|
|
|
Types: "",
|
|
|
// LinkNodeId: v.LinkNodeId,
|
|
|
Status: domain.StaffAssessUncompleted,
|
|
|
// BeginTime: time.Time{},
|
...
|
...
|
@@ -540,6 +540,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. |
|
|
stepSelfTemp.EndTime = v.EndTime
|
|
|
stepSelfTemp.LinkNodeId = v.LinkNodeId
|
|
|
stepSelfTemp.LinkNodeName = v.LinkNodeName
|
|
|
stepSelfTemp.Types = domain.AssessSelf
|
|
|
assessListTemp := srv.createStaffAssessSelf(stepSelfTemp, userList, userDepartmentMap)
|
|
|
assessList = append(assessList, assessListTemp...)
|
|
|
}
|
...
|
...
|
@@ -549,6 +550,7 @@ func (srv StaffAssessServeice) createStaffAssess(transactionContext application. |
|
|
stepSelfTemp.EndTime = v.EndTime
|
|
|
stepSelfTemp.LinkNodeId = v.LinkNodeId
|
|
|
stepSelfTemp.LinkNodeName = v.LinkNodeName
|
|
|
stepSelfTemp.Types = domain.AssessSuper
|
|
|
assessListTemp, err := srv.createStaffAssessSupper(transactionContext, stepSelfTemp, userList, userDepartmentMap)
|
|
|
if err != nil {
|
|
|
return nil, err
|
...
|
...
|
@@ -564,6 +566,7 @@ func (srv StaffAssessServeice) createStaffAssessSelf(assessTemp domain.StaffAsse |
|
|
userList []*domain.User, userDepartmentMap map[int64][]*domain.Department) []domain.StaffAssess {
|
|
|
result := []domain.StaffAssess{}
|
|
|
for _, usr := range userList {
|
|
|
|
|
|
assessTemp.TargetUser = domain.StaffDesc{
|
|
|
UserId: int(usr.Id),
|
|
|
Account: usr.Account,
|
...
|
...
|
|