切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
a5ae4b01b8f24bbc7ac8ed0df0adafa0c1274690
2 个父辈
cd3d32a1
bb04f9c3
Merge branch 'test' into dev-tangxvhui
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
32 行增加
和
18 行删除
pkg/application/staff_assess/service/service.go
pkg/application/staff_assess/service/service.go
查看文件 @
a5ae4b0
...
...
@@ -874,14 +874,9 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
assessReps
:=
factory
.
CreateStaffAssessRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
assessReps
:=
factory
.
CreateStaffAssessRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
//获取员工的评估
_
,
assessList
,
err
:=
assessReps
.
Find
(
map
[
string
]
interface
{}{
"companyId"
:
param
.
CompanyId
,
"id"
:
param
.
AssessId
,
})
_
,
assessList
,
err
:=
assessReps
.
Find
(
map
[
string
]
interface
{}{
"companyId"
:
param
.
CompanyId
,
"id"
:
param
.
AssessId
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取员工的评估"
+
err
.
Error
())
}
...
...
@@ -890,34 +885,52 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada
}
assessData
:=
assessList
[
0
]
var
assessContentList
[]
*
domain
.
StaffAssessContent
//已完成
assessContentRepo
:=
factory
.
CreateStaffAssessContentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
_
,
assessContentList
,
err
=
assessContentRepo
.
Find
(
map
[
string
]
interface
{}{
"staffAssessId"
:
assessData
.
Id
,
})
assessContentRepo
:=
factory
.
CreateStaffAssessContentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
_
,
assessContentList
,
err
=
assessContentRepo
.
Find
(
map
[
string
]
interface
{}{
"staffAssessId"
:
assessData
.
Id
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目填写内容"
+
err
.
Error
())
}
if
len
(
assessContentList
)
==
0
{
// 未完成
if
len
(
assessContentList
)
==
0
{
// 未完成
assessContentList
,
err
=
srv
.
getAssessInfoUncompletedV2
(
transactionContext
,
assessData
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目填写内容"
+
err
.
Error
())
}
}
targetUserDesc
,
err
:=
srv
.
getStaffDescrip
(
transactionContext
,
int64
(
assessData
.
TargetUser
.
UserId
))
if
err
!=
nil
{
log
.
Logger
.
Error
(
"获取员工描述"
+
err
.
Error
())
}
// 恢复缓存数据
if
param
.
AcquireCache
!=
0
{
srv
.
recoverAssessCache
(
transactionContext
,
assessData
.
Id
,
assessContentList
)
}
targetUserDesc
,
err
:=
srv
.
getStaffDescrip
(
transactionContext
,
int64
(
assessData
.
TargetUser
.
UserId
))
// 获取项目信息
projectRepository
:=
factory
.
CreateEvaluationProjectRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
project
,
err
:=
projectRepository
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
assessData
.
EvaluationProjectId
})
if
err
!=
nil
{
log
.
Logger
.
Error
(
"获取员工描述"
+
err
.
Error
())
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目错误:"
+
err
.
Error
())
}
taskRecords
:=
make
([]
*
domain
.
TaskRecord
,
0
)
// 任务负责人才能显示里程碑数据
if
project
.
PrincipalId
==
strconv
.
Itoa
(
assessData
.
TargetUser
.
UserId
)
{
// 获取里程碑数据
taskRecordRepository
:=
factory
.
CreateTaskRecordRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
_
,
taskRecords
,
err
=
taskRecordRepository
.
Find
(
map
[
string
]
interface
{}{
"staffAssessId"
:
assessData
.
Id
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取里程碑数据:"
+
err
.
Error
())
}
//// 恢复缓存数据(里程碑记录)这里可以不用恢复任务里程碑数据
//if param.AcquireCache != 0 {
// srv.recoverCacheWithTaskRecord(cache, taskRecords)
//}
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
...
...
@@ -940,6 +953,7 @@ func (srv StaffAssessServeice) GetAssessInfo(param *query.AssessInfoQuery) (*ada
SupperUser
:
""
,
DutyTime
:
""
,
AssessContent
:
assessContentList
,
TaskRecords
:
taskRecords
,
}
if
len
(
assessContentList
)
==
0
{
result
.
AssessContent
=
[]
*
domain
.
StaffAssessContent
{}
...
...
请
注册
或
登录
后发表评论