切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
6ef873d76ffe84ca08da7e67f21b371282c169dd
1 个父辈
12609834
调整
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
19 行增加
和
5 行删除
pkg/application/summary_evaluation/service/service.go
pkg/domain/summary_evaluation.go
pkg/application/summary_evaluation/service/service.go
查看文件 @
6ef873d
...
...
@@ -1518,7 +1518,9 @@ func (srv *SummaryEvaluationService) ConfirmScoreEvaluation(param *command.Confi
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
}
for
i
:=
range
itemList
{
result
.
ResetTotalRating
(
itemList
[
i
])
}
if
err
:=
result
.
EvaluationTotalScore
(
itemValues
);
err
!=
nil
{
return
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
...
...
@@ -1688,6 +1690,9 @@ func (srv *SummaryEvaluationService) GetTargetEvaluationResult(param *command.Qu
}
// 未完成考核,需要重新计算分数
if
result
.
CheckResult
==
domain
.
EvaluationCheckUncompleted
{
for
i
:=
range
itemList
{
result
.
ResetTotalRating
(
itemList
[
i
])
}
if
err
=
result
.
EvaluationTotalScore
(
itemValues
);
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
...
...
@@ -1702,7 +1707,7 @@ func (srv *SummaryEvaluationService) GetTargetEvaluationResult(param *command.Qu
// 组合 评估填写的值和评估项
itemValuesAdapter
:=
srv
.
buildSummaryItemValue
(
itemList
,
itemValues
)
codeList
:=
make
([]
*
adapter
.
LevalCodeCount
,
0
)
codeMap
:=
map
[
string
]
*
adapter
.
LevalCodeCount
{}
for
_
,
v
:=
range
itemValuesAdapter
{
//处理加分项评级汇总
...
...
@@ -1714,13 +1719,23 @@ func (srv *SummaryEvaluationService) GetTargetEvaluationResult(param *command.Qu
ItemList
:
[]
string
{},
}
codeMap
[
v
.
Value
]
=
code
codeList
=
append
(
codeList
,
code
)
}
codeMap
[
v
.
Value
]
.
ItemList
=
append
(
codeMap
[
v
.
Value
]
.
ItemList
,
v
.
Name
)
codeMap
[
v
.
Value
]
.
Number
+=
1
}
}
codeList
:=
make
([]
*
adapter
.
LevalCodeCount
,
0
)
for
_
,
val
:=
range
result
.
TotalRating
{
if
codeItem
,
ok
:=
codeMap
[
val
.
Code
];
ok
{
codeList
=
append
(
codeList
,
codeItem
)
}
else
{
codeList
=
append
(
codeList
,
&
adapter
.
LevalCodeCount
{
Code
:
val
.
Code
,
Number
:
0
,
ItemList
:
[]
string
{},
})
}
}
eiAdapter
:=
adapter
.
EvaluationInfoSuperAdapter
{
EvaluationBaseAdapter
:
evaluationBase
,
LevelCount
:
codeList
,
...
...
pkg/domain/summary_evaluation.go
查看文件 @
6ef873d
...
...
@@ -73,7 +73,6 @@ type SummaryEvaluationRepository interface {
// 计算总分。TotalScore 保留1位小数
func
(
evaluation
*
SummaryEvaluation
)
EvaluationTotalScore
(
valueList
[]
*
SummaryEvaluationValue
)
error
{
//重置计数
evaluation
.
TotalRating
=
make
([]
RatingCodeNumber
,
0
)
evaluation
.
TotalScore
=
"0"
//汇总评估填写值
var
totalScore
float64
...
...
请
注册
或
登录
后发表评论