切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
1b5a2cb921f4de275a3c810bb3af17832998b9a0
1 个父辈
76c9a4f4
微调
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
7 行删除
pkg/application/summary_evaluation/adapter/evaluation_info.go
pkg/application/summary_evaluation/service/service.go
pkg/application/summary_evaluation/adapter/evaluation_info.go
查看文件 @
1b5a2cb
...
...
@@ -37,6 +37,7 @@ type EvaluationItemAdapter struct {
Required
int
`json:"required"`
// 必填项
Value
string
`json:"value"`
//评估填写的评分
Score
string
`json:"score"`
//计算的评定得分
Rating
domain
.
RatingLevel
`json:"rating"`
//评级的选项
Remark
string
`json:"remark"`
//填写的内容反馈
EvaluatorId
int
`json:"evaluatorId"`
//评估人id
EvaluatorName
string
`json:"evaluatorName"`
//评估人名称
...
...
pkg/application/summary_evaluation/service/service.go
查看文件 @
1b5a2cb
...
...
@@ -2,7 +2,6 @@ package service
import
(
"fmt"
"time"
"github.com/linmadan/egglib-go/core/application"
"github.com/linmadan/egglib-go/utils/tool_funs"
...
...
@@ -278,6 +277,7 @@ func (srv *SummaryEvaluationService) buildSummaryItemValue(itemList []*domain.Ev
item
.
Score
=
value
.
Score
item
.
Value
=
value
.
Value
item
.
Remark
=
value
.
Remark
item
.
Rating
=
value
.
Rating
}
itemValues
=
append
(
itemValues
,
item
)
}
...
...
@@ -474,7 +474,6 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
mValue
.
Id
=
v
.
Id
}
}
nowTime
:=
time
.
Now
()
for
_
,
v
:=
range
param
.
EvaluationItems
{
updatedData
,
ok
:=
evaluationValueMap
[
v
.
EvaluationItemId
]
if
!
ok
{
...
...
@@ -484,7 +483,6 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
if
!
ok
{
continue
}
updatedData
.
UpdatedAt
=
nowTime
//填充评估填写值
err
=
updatedData
.
FillValue
(
evaluationItem
,
v
.
Value
,
v
.
Remark
)
if
err
!=
nil
{
...
...
@@ -506,7 +504,6 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
evaluationData
.
UpdatedAt
=
nowTime
evaluationData
.
Status
=
domain
.
EvaluationCompleted
//保存填写值
err
=
evaluationRepo
.
Save
(
evaluationData
)
...
...
@@ -862,7 +859,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
mValue
.
Id
=
v
.
Id
}
}
nowTime
:=
time
.
Now
()
for
_
,
v
:=
range
param
.
EvaluationItems
{
updatedData
,
ok
:=
evaluationValueMap
[
v
.
EvaluationItemId
]
if
!
ok
{
...
...
@@ -884,7 +881,6 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
}
updatedData
.
UpdatedAt
=
nowTime
}
evaluationValueList
:=
[]
*
domain
.
SummaryEvaluationValue
{}
for
_
,
v
:=
range
evaluationValueMap
{
...
...
@@ -900,7 +896,7 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
evaluationData
.
UpdatedAt
=
nowTime
//变更评估状态为已填写
evaluationData
.
Status
=
domain
.
EvaluationCompleted
//保存填写值
err
=
evaluationRepo
.
Save
(
evaluationData
)
...
...
请
注册
或
登录
后发表评论