切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
f5041ab1c67787f520eb031ae0230859fed475d9
1 个父辈
c33ed551
master
...
dev-tangxvhui
dev-zhengzhou
test
v2.2.0-fix
修复 问题,评估内容 未顺利保存。
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
9 行增加
和
8 行删除
pkg/application/summary_evaluation/service/edit_evaluation.go
pkg/application/summary_evaluation/service/edit_evaluation_360.go
pkg/application/summary_evaluation/service/edit_evaluation_hrbp.go
pkg/application/summary_evaluation/service/edit_evaluation_self.go
pkg/application/summary_evaluation/service/edit_evaluation_super.go
pkg/application/summary_evaluation/service/edit_evaluation.go
查看文件 @
f5041ab
...
...
@@ -110,8 +110,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
if
evalutionHrbp
!=
nil
&&
val
.
EvaluatorId
==
-
1
{
newItemValue
:=
domain
.
SummaryEvaluationValue
{}
newItemValue
.
SetBlankValue
(
evalutionHrbp
,
val
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
evalutionHrbp
.
FillItemValue
(
val
,
&
newItemValue
,
itemValueParam
[
val
.
Id
]
.
Value
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
newItemValue
.
HrCheck
=
param
.
ExecutorId
newHrbpItemValueList
=
append
(
newHrbpItemValueList
,
&
newItemValue
)
temp
=
newItemValue
...
...
@@ -126,8 +126,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
}
newItemValue
:=
domain
.
SummaryEvaluationValue
{}
newItemValue
.
SetBlankValue
(
evaluation360
,
val
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
evaluation360
.
FillItemValue
(
val
,
&
newItemValue
,
itemValueParam
[
val
.
Id
]
.
Value
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
newItemValue
.
HrCheck
=
param
.
ExecutorId
itemValue360List
=
append
(
itemValue360List
,
&
newItemValue
)
new360ItemValueList
[
evaluation360
.
Executor
.
UserId
]
=
itemValue360List
...
...
@@ -138,8 +138,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
if
evaluationSuper
!=
nil
{
newItemValue
:=
domain
.
SummaryEvaluationValue
{}
newItemValue
.
SetBlankValue
(
evaluationSuper
,
val
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
evaluationSuper
.
FillItemValue
(
val
,
&
newItemValue
,
itemValueParam
[
val
.
Id
]
.
Value
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
newItemValue
.
HrCheck
=
param
.
ExecutorId
newSuperItemValueList
=
append
(
newSuperItemValueList
,
&
newItemValue
)
temp
=
newItemValue
...
...
@@ -148,8 +148,8 @@ func (srv *SummaryEvaluationService) EditEvaluationByHrCheck(param *command.Edit
if
evalutionFinish
!=
nil
{
newItemValue
:=
domain
.
SummaryEvaluationValue
{}
newItemValue
.
SetBlankValue
(
evalutionFinish
,
val
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
evalutionFinish
.
FillItemValue
(
val
,
&
newItemValue
,
itemValueParam
[
val
.
Id
]
.
Value
)
newItemValue
.
Remark
=
itemValueParam
[
val
.
Id
]
.
Remark
newItemValue
.
HrCheck
=
param
.
ExecutorId
newFinishItemValueList
=
append
(
newFinishItemValueList
,
&
newItemValue
)
}
...
...
pkg/application/summary_evaluation/service/edit_evaluation_360.go
查看文件 @
f5041ab
...
...
@@ -233,11 +233,12 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua
}
}
//填充评估填写值
newItemValue
.
Remark
=
v
.
Remark
err
:=
summaryEvaluation
.
FillItemValue
(
evaluationItem
,
newItemValue
,
v
.
Value
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
newItemValue
.
Remark
=
v
.
Remark
}
summaryEvaluation
.
EvaluationTotalScore
(
evaluationValueSlice
)
}
...
...
pkg/application/summary_evaluation/service/edit_evaluation_hrbp.go
查看文件 @
f5041ab
...
...
@@ -360,11 +360,11 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu
}
}
//填充评估填写值
newItemValue
.
Remark
=
v
.
Remark
err
:=
summaryEvaluation
.
FillItemValue
(
evaluationItem
,
newItemValue
,
v
.
Value
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
newItemValue
.
Remark
=
v
.
Remark
}
summaryEvaluation
.
EvaluationTotalScore
(
evaluationValueSlice
)
}
...
...
pkg/application/summary_evaluation/service/edit_evaluation_self.go
查看文件 @
f5041ab
...
...
@@ -309,11 +309,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSelfV2(param *command.EditEva
}
}
//填充评估填写值
newItemValue
.
Remark
=
v
.
Remark
err
:=
evaluationData
.
FillItemValue
(
evaluationItem
,
newItemValue
,
v
.
Value
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
newItemValue
.
Remark
=
v
.
Remark
}
evaluationData
.
EvaluationTotalScore
(
evaluationValueSlice
)
}
...
...
pkg/application/summary_evaluation/service/edit_evaluation_super.go
查看文件 @
f5041ab
...
...
@@ -412,11 +412,11 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
}
}
//填充评估填写值
newItemValue
.
Remark
=
v
.
Remark
err
:=
evaluationData
.
FillItemValue
(
evaluationItem
,
newItemValue
,
v
.
Value
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
newItemValue
.
Remark
=
v
.
Remark
}
// 填入固定的默认值
for
_
,
v
:=
range
hrbpOr360ItemValue
{
...
...
请
注册
或
登录
后发表评论