...
|
...
|
@@ -976,6 +976,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map |
|
|
|
|
|
resultList := []adapter.TaskRecordAdapter{}
|
|
|
for _, val := range taskRecordList {
|
|
|
|
|
|
item := adapter.TaskRecordAdapter{
|
|
|
Id: val.Id,
|
|
|
StaffAssessId: val.StaffAssessId,
|
...
|
...
|
@@ -1012,7 +1013,7 @@ func (srv TaskService) ListTaskRecord(param *command.ListTaskRecordCommand) (map |
|
|
}
|
|
|
if len(contentList) > 0 {
|
|
|
for _, val2 := range contentList[0].Remark {
|
|
|
item.AssistContent = val2.RemarkText + "\n"
|
|
|
item.AssistContent += val2.RemarkText + "\n"
|
|
|
}
|
|
|
}
|
|
|
resultList = append(resultList, item)
|
...
|
...
|
@@ -1147,13 +1148,13 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i |
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取用户的角色信息"+err.Error())
|
|
|
}
|
|
|
if len(param.SearchWord) > 0 {
|
|
|
param.SearchWord = "%" + param.SearchWord + "%"
|
|
|
}
|
|
|
if hrbpFlag == domain.RoleTypeSystem {
|
|
|
listData, err := srv.listTask3ForHrbp(param)
|
|
|
return listData, err
|
|
|
}
|
|
|
if len(param.SearchWord) > 0 {
|
|
|
param.SearchWord = "%" + param.SearchWord + "%"
|
|
|
}
|
|
|
var limit = 20
|
|
|
var offset = 0
|
|
|
if param.PageSize > 0 {
|
...
|
...
|
|