切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
5ebb86fcaa71596e293a391294b7caa35342bfb9
1 个父辈
f5729ebc
修bug
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
8 行增加
和
3 行删除
pkg/application/summary_evaluation/service/edit_evaluation_admin.go
pkg/application/summary_evaluation/service/edit_evaluation_hrbp.go
pkg/application/summary_evaluation/service/edit_evaluation_self.go
pkg/application/summary_evaluation/service/service.go
pkg/application/summary_evaluation/service/service2.go
pkg/application/summary_evaluation/service/edit_evaluation_admin.go
查看文件 @
5ebb86f
package
service
import
(
"time"
"github.com/linmadan/egglib-go/core/application"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
roleService
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role"
...
...
@@ -218,6 +220,7 @@ func (srv *SummaryEvaluationService) EditEvaluationFinish(param *command.EditEva
}
result
.
Status
=
domain
.
EvaluationCompleted
result
.
CompletedAt
=
time
.
Now
()
.
Unix
()
result
.
CheckResult
=
domain
.
EvaluationCheckUncompleted
err
=
evaluationRepo
.
Save
(
result
)
if
err
!=
nil
{
...
...
pkg/application/summary_evaluation/service/edit_evaluation_hrbp.go
查看文件 @
5ebb86f
...
...
@@ -222,6 +222,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(
evaluationFinishList
[
0
]
.
BeginTime
=
nowTime
}
evaluationFinishList
[
0
]
.
Status
=
domain
.
EvaluationCompleted
evaluationFinishList
[
0
]
.
CompletedAt
=
time
.
Now
()
.
Unix
()
err
=
evaluationRepo
.
Save
(
evaluationFinishList
[
0
])
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"保存考核结果,"
+
err
.
Error
())
...
...
pkg/application/summary_evaluation/service/edit_evaluation_self.go
查看文件 @
5ebb86f
...
...
@@ -190,6 +190,7 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(
evaluationFinish
.
BeginTime
=
nowTime
}
evaluationFinish
.
Status
=
domain
.
EvaluationCompleted
evaluationFinish
.
CompletedAt
=
time
.
Now
()
.
Unix
()
err
=
evaluationRepo
.
Save
(
evaluationFinish
)
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"保存考核结果,"
+
err
.
Error
())
...
...
pkg/application/summary_evaluation/service/service.go
查看文件 @
5ebb86f
...
...
@@ -466,7 +466,7 @@ func (srv *SummaryEvaluationService) getSummaryEvaluation(transactionContext app
CompletedAt
:
evaluationData
.
CompletedAt
,
Version
:
string
(
evaluationData
.
Version
),
}
if
evaluationData
.
CompletedAt
==
0
{
if
evaluationData
.
Status
==
domain
.
EvaluationUncompleted
{
result
.
Status
=
string
(
domain
.
EvaluationUncompleted
)
//未完成
}
else
{
if
evaluationData
.
EndTime
.
Unix
()
<
evaluationData
.
CompletedAt
{
...
...
pkg/application/summary_evaluation/service/service2.go
查看文件 @
5ebb86f
...
...
@@ -251,7 +251,7 @@ func (srv *SummaryEvaluationService) GetEvaluation360(param *command.QueryEvalua
// 评估项截止时间
endTime
:=
sEvaluation
.
EndTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
)
result
:=
map
[
string
]
interface
{}{
"endTime"
:
endTime
,
"version"
:
sEvaluation
.
Version
,
"status"
:
sEvaluation
.
Status
,
"list"
:
itemValuesAdapter
}
if
sEvaluation
.
CompletedAt
==
0
{
if
sEvaluation
.
Status
==
domain
.
EvaluationUncompleted
{
result
[
"status"
]
=
string
(
domain
.
EvaluationUncompleted
)
//未完成
}
else
{
if
sEvaluation
.
EndTime
.
Unix
()
<
sEvaluation
.
CompletedAt
{
...
...
@@ -560,7 +560,7 @@ func (srv *SummaryEvaluationService) GetEvaluationHRBP(param *command.QueryEvalu
// 评估项截止时间
endTime
:=
sEvaluation
.
EndTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
)
result
:=
map
[
string
]
interface
{}{
"endTime"
:
endTime
,
"version"
:
sEvaluation
.
Version
,
"status"
:
""
,
"list"
:
itemValuesAdapter
}
if
sEvaluation
.
CompletedAt
==
0
{
if
sEvaluation
.
Status
==
domain
.
EvaluationUncompleted
{
result
[
"status"
]
=
string
(
domain
.
EvaluationUncompleted
)
//未完成
}
else
{
if
sEvaluation
.
EndTime
.
Unix
()
<
sEvaluation
.
CompletedAt
{
...
...
请
注册
或
登录
后发表评论