切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
abffb1119977645a7abcfd85f92b4e9dac730185
1 个父辈
65d1db38
更新 数据结构,IsTemporary
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
28 行增加
和
10 行删除
pkg/application/summary_evaluation/command/edit_evaluation_value.go
pkg/application/summary_evaluation/service/service.go
pkg/application/summary_evaluation/service/service2.go
pkg/domain/summary_evaluation_value.go
pkg/infrastructure/pg/models/summary_evaluation_value.go
pkg/infrastructure/repository/pg_summary_evaluation_value_repository.go
pkg/application/summary_evaluation/command/edit_evaluation_value.go
查看文件 @
abffb11
...
...
@@ -5,6 +5,7 @@ type EditEvaluationValue struct {
ExecutorId
int
`json:"-"`
// 执行人id
CompanyId
int
`json:"-"`
// 公司id
EvaluationItems
[]
UpdatedItemValue
`json:"evaluationItems"`
IsTemporary
bool
`json:"isTemporary"`
//是否是临时提交
}
type
UpdatedItemValue
struct
{
...
...
pkg/application/summary_evaluation/service/service.go
查看文件 @
abffb11
...
...
@@ -465,11 +465,13 @@ func (srv *SummaryEvaluationService) EditEvaluationSelf(param *command.EditEvalu
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
err
=
srv
.
editEvaluationValue
(
evaluationData
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
nil
)
err
=
srv
.
editEvaluationValue
(
evaluationData
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
nil
,
param
.
IsTemporary
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
evaluationData
.
Status
=
domain
.
EvaluationCompleted
if
!
param
.
IsTemporary
{
evaluationData
.
Status
=
domain
.
EvaluationCompleted
}
//保存填写值
for
_
,
v
:=
range
itemValueList
{
err
=
itemValueRepo
.
Save
(
v
)
...
...
@@ -801,12 +803,14 @@ func (srv *SummaryEvaluationService) EditEvaluationSuper(param *command.EditEval
return
nil
,
err
}
err
=
srv
.
editEvaluationValue
(
evaluationData
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
hrbpOr360ItemValue
)
err
=
srv
.
editEvaluationValue
(
evaluationData
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
hrbpOr360ItemValue
,
param
.
IsTemporary
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
//变更评估状态为已填写
evaluationData
.
Status
=
domain
.
EvaluationCompleted
if
!
param
.
IsTemporary
{
//变更评估状态为已填写
evaluationData
.
Status
=
domain
.
EvaluationCompleted
}
for
_
,
v
:=
range
itemValueList
{
//保存填写值
err
=
itemValueRepo
.
Save
(
v
)
...
...
@@ -1337,6 +1341,7 @@ func (srv *SummaryEvaluationService) editEvaluationValue(
evaluationItems
[]
*
domain
.
EvaluationItemUsed
,
updatedValue
[]
command
.
UpdatedItemValue
,
defaultItemValue
[]
*
domain
.
SummaryEvaluationValue
,
IsTemporary
bool
,
)
error
{
evaluationItemMap
:=
map
[
int
]
*
domain
.
EvaluationItemUsed
{}
evaluationValueMap
:=
map
[
int
]
*
domain
.
SummaryEvaluationValue
{}
...
...
@@ -1344,6 +1349,9 @@ func (srv *SummaryEvaluationService) editEvaluationValue(
for
_
,
v
:=
range
evaluationItems
{
newValue
:=
&
domain
.
SummaryEvaluationValue
{}
newValue
.
SetBlankValue
(
evaluationData
,
v
)
if
IsTemporary
{
newValue
.
IsTemporary
=
1
}
evaluationValueMap
[
v
.
Id
]
=
newValue
evaluationItemMap
[
v
.
Id
]
=
v
//重置计数
...
...
pkg/application/summary_evaluation/service/service2.go
查看文件 @
abffb11
...
...
@@ -390,12 +390,15 @@ func (srv *SummaryEvaluationService) EditEvaluation360(param *command.EditEvalua
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
err
=
srv
.
editEvaluationValue
(
summaryEvaluation
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
nil
)
err
=
srv
.
editEvaluationValue
(
summaryEvaluation
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
nil
,
param
.
IsTemporary
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
if
!
param
.
IsTemporary
{
//变更评估状态为已填写
summaryEvaluation
.
Status
=
domain
.
EvaluationCompleted
}
summaryEvaluation
.
Status
=
domain
.
EvaluationCompleted
//保存填写值
for
_
,
v
:=
range
itemValueList
{
err
=
itemValueRepo
.
Save
(
v
)
...
...
@@ -702,12 +705,14 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
err
=
srv
.
editEvaluationValue
(
summaryEvaluation
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
nil
)
err
=
srv
.
editEvaluationValue
(
summaryEvaluation
,
&
itemValueList
,
itemList
,
param
.
EvaluationItems
,
nil
,
param
.
IsTemporary
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
summaryEvaluation
.
Status
=
domain
.
EvaluationCompleted
if
!
param
.
IsTemporary
{
//变更评估状态为已填写
summaryEvaluation
.
Status
=
domain
.
EvaluationCompleted
}
//保存填写值
for
_
,
v
:=
range
itemValueList
{
err
=
itemValueRepo
.
Save
(
v
)
...
...
pkg/domain/summary_evaluation_value.go
查看文件 @
abffb11
...
...
@@ -19,6 +19,7 @@ type SummaryEvaluationValue struct {
Rating
RatingLevel
`json:"rating"`
//评级时的填写值
CreatedAt
time
.
Time
`json:"createdAt"`
//数据创建时间
UpdatedAt
time
.
Time
`json:"updatedAt"`
//数据更新时间
IsTemporary
int
`json:"IsTemporary"`
// 0-正式数据 1-临时提交的数据
}
type
SummaryEvaluationValueRepository
interface
{
...
...
pkg/infrastructure/pg/models/summary_evaluation_value.go
查看文件 @
abffb11
...
...
@@ -20,4 +20,5 @@ type SummaryEvaluationValue struct {
Remark
string
//填写的内容反馈
CreatedAt
time
.
Time
//数据创建时间
UpdatedAt
time
.
Time
//数据更新时间
IsTemporary
int
`pg:",use_zero"`
// 0-正式数据 1-临时提交的数据
}
...
...
pkg/infrastructure/repository/pg_summary_evaluation_value_repository.go
查看文件 @
abffb11
...
...
@@ -34,6 +34,7 @@ func (repo *SummaryEvaluationValueRepository) TransformToDomain(d *models.Summar
Rating
:
d
.
Rating
,
CreatedAt
:
d
.
CreatedAt
,
UpdatedAt
:
d
.
UpdatedAt
,
IsTemporary
:
d
.
IsTemporary
,
}
}
...
...
@@ -50,6 +51,7 @@ func (repo *SummaryEvaluationValueRepository) Save(param *domain.SummaryEvaluati
Remark
:
param
.
Remark
,
CreatedAt
:
param
.
CreatedAt
,
UpdatedAt
:
param
.
UpdatedAt
,
IsTemporary
:
param
.
IsTemporary
,
}
db
:=
repo
.
transactionContext
.
PgTx
if
m
.
Id
==
0
{
...
...
请
注册
或
登录
后发表评论