切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郑周
2 years ago
提交
2b745c3d3829289094aa62de942ffe9002310486
1 个父辈
7f8f1e0e
1. 命名优化
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
20 行增加
和
18 行删除
pkg/application/permission/permission_service.go
pkg/application/summary_evaluation/service/scheduled_v2.go
pkg/domain/permission.go
pkg/infrastructure/pg/models/permission.go
pkg/infrastructure/repository/pg_permission_repository.go
pkg/application/permission/permission_service.go
查看文件 @
2b745c3
...
...
@@ -74,7 +74,7 @@ func (rs *PermissionService) Update(in *command.UpdatePermissionCommand) (interf
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"截止时间:[查看我的绩效]不能小于[上级评估]"
)
}
permission
.
OptConfirmPerf
=
in
.
OptConfirmPerf
permission
.
CycleDead
L
ine
=
in
.
CycleDeadLine
permission
.
CycleDead
l
ine
=
in
.
CycleDeadLine
}
permission
,
err
=
permissionRepository
.
Insert
(
permission
)
...
...
@@ -88,6 +88,8 @@ func (rs *PermissionService) Update(in *command.UpdatePermissionCommand) (interf
}
func
(
rs
*
PermissionService
)
Get
(
in
*
command
.
GetPermissionCommand
)
(
*
domain
.
Permission
,
error
)
{
in
.
CompanyId
=
8
transactionContext
,
err
:=
factory
.
ValidateStartTransaction
(
in
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -110,7 +112,7 @@ func (rs *PermissionService) Get(in *command.GetPermissionCommand) (*domain.Perm
OptHrScore
:
domain
.
PermissionOff
,
OptEvalScore
:
domain
.
PermissionOff
,
OptConfirmPerf
:
domain
.
PermissionOff
,
CycleDead
L
ine
:
rs
.
defaultCycleDeadline
(),
CycleDead
l
ine
:
rs
.
defaultCycleDeadline
(),
}
permission
,
err
=
permissionRepository
.
Insert
(
value
)
if
err
!=
nil
{
...
...
@@ -132,9 +134,9 @@ func (rs *PermissionService) Get(in *command.GetPermissionCommand) (*domain.Perm
isChange
=
true
permission
.
OptConfirmPerf
=
domain
.
PermissionOff
}
if
permission
.
CycleDead
L
ine
==
nil
{
if
permission
.
CycleDead
l
ine
==
nil
{
isChange
=
true
permission
.
CycleDead
L
ine
=
rs
.
defaultCycleDeadline
()
permission
.
CycleDead
l
ine
=
rs
.
defaultCycleDeadline
()
}
if
isChange
{
permission
,
err
=
permissionRepository
.
Insert
(
permission
)
...
...
pkg/application/summary_evaluation/service/scheduled_v2.go
查看文件 @
2b745c3
...
...
@@ -169,26 +169,26 @@ func (se *summaryEvaluationPublisher) sendSummaryEvaluationV2(
beginTimeSelf
:=
*
cycleData
.
TimeEnd
//
beginDay
:=
dayEndTime
(
beginTimeSelf
)
//修改 周期结束时间那天的第二天开始计算
endTimeSelf
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentSelf
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentSelf
.
Minute
)
*
time
.
Minute
)
endTimeSelf
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentSelf
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentSelf
.
Minute
)
*
time
.
Minute
)
//人资、360评估的时间范围
beginTime360
:=
endTimeSelf
endTime360
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentAll
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentAll
.
Minute
)
*
time
.
Minute
)
endTime360
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentAll
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentAll
.
Minute
)
*
time
.
Minute
)
//人资评估的时间范围
beginTimeHr
:=
endTimeSelf
endTimeHr
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentHr
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentHr
.
Minute
)
*
time
.
Minute
)
endTimeHr
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentHr
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentHr
.
Minute
)
*
time
.
Minute
)
//上级评估的是时间范围
beginTimeSuper
:=
endTimeHr
endTimeSuper
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentSuperior
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
AssessmentSuperior
.
Minute
)
*
time
.
Minute
)
endTimeSuper
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentSuperior
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
AssessmentSuperior
.
Minute
)
*
time
.
Minute
)
//考核结果的时间范围
beginTimeFinish
:=
endTimeSuper
endTimeFinish
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
ViewMyPerf
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadLine
.
ViewMyPerf
.
Minute
)
*
time
.
Minute
)
endTimeFinish
:=
beginDay
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
ViewMyPerf
.
Hour
)
*
time
.
Hour
)
.
Add
(
time
.
Duration
(
permissioData
.
CycleDeadline
.
ViewMyPerf
.
Minute
)
*
time
.
Minute
)
// 创建周期评估任务
var
newEvaluationList
[]
domain
.
SummaryEvaluation
evaluationTemp
:=
domain
.
SummaryEvaluation
{
...
...
pkg/domain/permission.go
查看文件 @
2b745c3
...
...
@@ -13,7 +13,7 @@ type Permission struct {
OptHrScore
int
`json:"optHrScore" comment:"上级是否可以修改人资综评分数"`
OptEvalScore
int
`json:"optEvalScore" comment:"上级是否可以修改360°综评分数"`
OptConfirmPerf
int
`json:"optConfirmPerf " comment:"是否需要员工确认绩效"`
CycleDead
L
ine
*
CycleDeadline
`json:"cycleDeadline" comment:"周期评估各业务截止时间"`
CycleDead
l
ine
*
CycleDeadline
`json:"cycleDeadline" comment:"周期评估各业务截止时间"`
CreatedAt
time
.
Time
`json:"createdAt" comment:"创建时间"`
UpdatedAt
time
.
Time
`json:"updatedAt" comment:"更新时间"`
DeletedAt
*
time
.
Time
`json:"deletedAt" comment:"删除时间"`
...
...
pkg/infrastructure/pg/models/permission.go
查看文件 @
2b745c3
...
...
@@ -12,7 +12,7 @@ type Permission struct {
OptHrScore
int
`comment:"上级是否可以修改人资综评分数"`
OptEvalScore
int
`comment:"上级是否可以修改360°综评分数"`
OptConfirmPerf
int
`comment:"是否需要员工确认绩效"`
CycleDead
L
ine
*
domain
.
CycleDeadline
`comment:"周期评估各业务截止时间"`
CycleDead
l
ine
*
domain
.
CycleDeadline
`comment:"周期评估各业务截止时间"`
CreatedAt
time
.
Time
`comment:"创建时间"`
UpdatedAt
time
.
Time
`comment:"更新时间"`
DeletedAt
*
time
.
Time
`comment:"删除时间"`
...
...
pkg/infrastructure/repository/pg_permission_repository.go
查看文件 @
2b745c3
...
...
@@ -27,7 +27,7 @@ func (repo *PermissionRepository) TransformToDomain(m *models.Permission) domain
OptHrScore
:
m
.
OptHrScore
,
OptEvalScore
:
m
.
OptEvalScore
,
OptConfirmPerf
:
m
.
OptConfirmPerf
,
CycleDead
Line
:
m
.
CycleDeadL
ine
,
CycleDead
line
:
m
.
CycleDeadl
ine
,
CreatedAt
:
m
.
CreatedAt
.
Local
(),
UpdatedAt
:
m
.
UpdatedAt
.
Local
(),
DeletedAt
:
m
.
DeletedAt
,
...
...
@@ -41,7 +41,7 @@ func (repo *PermissionRepository) TransformToModel(d *domain.Permission) models.
OptHrScore
:
d
.
OptHrScore
,
OptEvalScore
:
d
.
OptEvalScore
,
OptConfirmPerf
:
d
.
OptConfirmPerf
,
CycleDead
Line
:
d
.
CycleDeadL
ine
,
CycleDead
line
:
d
.
CycleDeadl
ine
,
CreatedAt
:
d
.
CreatedAt
,
UpdatedAt
:
d
.
UpdatedAt
,
DeletedAt
:
d
.
DeletedAt
,
...
...
请
注册
或
登录
后发表评论