切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
c807b6e60081872ff705baecd24fed7810e3f2f8
1 个父辈
faced9cb
更新评估的状态
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
100 行增加
和
6 行删除
pkg/application/summary_evaluation/service/service.go
pkg/application/summary_evaluation/service/service2.go
pkg/application/summary_evaluation/service/service.go
查看文件 @
c807b6e
...
...
@@ -2,6 +2,7 @@ package service
import
(
"fmt"
"time"
"github.com/linmadan/egglib-go/core/application"
"github.com/linmadan/egglib-go/utils/tool_funs"
...
...
@@ -135,12 +136,13 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
}
//查找当前周期,我的考核结果
_
,
myEvaluationSuper
,
err
:=
evaluationRepo
.
Find
(
map
[
string
]
interface
{}{
_
,
myEvaluationSuper
,
_
:=
evaluationRepo
.
Find
(
map
[
string
]
interface
{}{
"types"
:
int
(
domain
.
EvaluationSuper
),
"limit"
:
1
,
"targetUserId"
:
param
.
UserId
,
"cycleId"
:
param
.
CycleId
,
})
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
...
...
@@ -164,10 +166,10 @@ func (srv *SummaryEvaluationService) GetMenu(param *command.QueryMenu) (map[stri
}
menu1_2
:=
adapter
.
MenuListAdapter
{
CycleId
:
param
.
CycleId
,
NodeName
:
"查看
综合自评
"
,
NodeName
:
"查看
我的成绩
"
,
StatusName
:
""
,
TargetUserId
:
param
.
UserId
,
Types
:
"查看
综合自评
"
,
Types
:
"查看
我的成绩
"
,
}
if
len
(
selfEvaluation
)
>
0
{
if
selfEvaluation
[
0
]
.
Status
==
domain
.
EvaluationCompleted
{
...
...
@@ -477,9 +479,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
if
!
param
.
IsTemporary
{
evaluationData
.
Status
=
domain
.
EvaluationCompleted
}
//保存填写值
for
_
,
v
:=
range
itemValueList
{
err
=
itemValueRepo
.
Save
(
v
)
...
...
@@ -487,6 +487,16 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
}
if
!
param
.
IsTemporary
{
if
evaluationData
.
Status
==
domain
.
EvaluationUncompleted
{
err
=
srv
.
AfterCompletedEvaluationSelf
(
transactionContext
,
evaluationData
)
if
err
!=
nil
{
return
nil
,
err
}
}
evaluationData
.
Status
=
domain
.
EvaluationCompleted
}
err
=
evaluationRepo
.
Save
(
evaluationData
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
...
...
@@ -500,6 +510,78 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
},
nil
}
// 员工提交自评内容后,
// 员工作为被评估人,
// 变更360评估/人资评估/上级评估的开始时间
func
(
srv
*
SummaryEvaluationService
)
AfterCompletedEvaluationSelf
(
transactionContext
application
.
TransactionContext
,
param
*
domain
.
SummaryEvaluation
)
error
{
evaluationRepo
:=
factory
.
CreateSummaryEvaluationRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
_
,
evaluationList
,
err
:=
evaluationRepo
.
Find
(
map
[
string
]
interface
{}{
"targetUserId"
:
param
.
TargetUser
.
UserId
,
"typesList"
:
[]
int
{
int
(
domain
.
Evaluation360
),
int
(
domain
.
EvaluationHrbp
),
int
(
domain
.
EvaluationSuper
)},
"cycleId"
:
param
.
CycleId
,
"limit"
:
1000
,
})
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 变更360评估/人资评估/上级评估的开始时间
for
_
,
v
:=
range
evaluationList
{
v
.
BeginTime
=
time
.
Now
()
err
=
evaluationRepo
.
Save
(
v
)
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
}
return
nil
}
// 被评估员工的人资评估 或者 360 评估,
// 变更上级评估的开始时间
func
(
srv
*
SummaryEvaluationService
)
AfterCompletedEvaluation360Hrbp
(
transactionContext
application
.
TransactionContext
,
param
*
domain
.
SummaryEvaluation
)
error
{
evaluationRepo
:=
factory
.
CreateSummaryEvaluationRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
_
,
evaluation360HrbList
,
err
:=
evaluationRepo
.
Find
(
map
[
string
]
interface
{}{
"targetUserId"
:
param
.
TargetUser
.
UserId
,
"typesList"
:
[]
int
{
int
(
domain
.
Evaluation360
),
int
(
domain
.
EvaluationHrbp
)},
"cycleId"
:
param
.
CycleId
,
"limit"
:
1000
,
})
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
allCompleted
:=
true
for
_
,
v
:=
range
evaluation360HrbList
{
if
v
.
Status
==
domain
.
EvaluationUncompleted
{
allCompleted
=
false
break
}
}
if
!
allCompleted
{
return
nil
}
_
,
evaluationList
,
err
:=
evaluationRepo
.
Find
(
map
[
string
]
interface
{}{
"targetUserId"
:
param
.
TargetUser
.
UserId
,
"typesList"
:
[]
int
{
int
(
domain
.
EvaluationSuper
)},
"cycleId"
:
param
.
CycleId
,
"limit"
:
1000
,
})
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 变更360评估/人资评估/上级评估的开始时间
for
_
,
v
:=
range
evaluationList
{
v
.
BeginTime
=
time
.
Now
()
err
=
evaluationRepo
.
Save
(
v
)
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
}
return
nil
}
// GetTargetUserCycleList
// 获取周期列表,被评估的周期列表
func
(
srv
*
SummaryEvaluationService
)
GetTargetUserCycleList
(
param
*
command
.
QueryCycleList
)
(
map
[
string
]
interface
{},
error
)
{
...
...
pkg/application/summary_evaluation/service/service2.go
查看文件 @
c807b6e
...
...
@@ -390,6 +390,12 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
if
!
param
.
IsTemporary
{
if
summaryEvaluation
.
Status
==
domain
.
EvaluationUncompleted
{
err
=
srv
.
AfterCompletedEvaluation360Hrbp
(
transactionContext
,
summaryEvaluation
)
if
err
!=
nil
{
return
nil
,
err
}
}
//变更评估状态为已填写
summaryEvaluation
.
Status
=
domain
.
EvaluationCompleted
}
...
...
@@ -756,6 +762,12 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
if
!
param
.
IsTemporary
{
if
summaryEvaluation
.
Status
==
domain
.
EvaluationUncompleted
{
err
=
srv
.
AfterCompletedEvaluation360Hrbp
(
transactionContext
,
summaryEvaluation
)
if
err
!=
nil
{
return
nil
,
err
}
}
//变更评估状态为已填写
summaryEvaluation
.
Status
=
domain
.
EvaluationCompleted
}
...
...
请
注册
或
登录
后发表评论