切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
Your Name
2 years ago
提交
ce5bb5c2eac78f01140c91ca9e9b3b13675f01fc
1 个父辈
30d8f076
master
...
dev-pushdata
dev-tangxvhui
dev-zhengzhou
test
v1.3.2-fix
v1.4.0
v2.2.0-fix
20230410
20230403
20230331
20230324
20230315
20230203
20230112
20221208
20221205
v2.2.0
v2.0.0
v1.3.2
v1.3.2-fix
v1.3.1
v1.3.0
v1.2.4
更新
显示空白字符变更
内嵌
并排对比
正在显示
10 个修改的文件
包含
82 行增加
和
34 行删除
pkg/application/factory/reposetory.go
pkg/application/staff_assess/adapter/search_assess_me.go
pkg/application/staff_assess/query/assess_task_desc.go
pkg/application/staff_assess/query/search_assess_me.go
pkg/application/staff_assess/service/service.go
pkg/domain/staff_assess.go
pkg/domain/staff_assess_task.go
pkg/infrastructure/pg/models/staff_assess_task.go
pkg/infrastructure/repository/pg_staff_assess_repository.go
pkg/infrastructure/repository/pg_staff_assess_task_repository.go
pkg/application/factory/reposetory.go
查看文件 @
ce5bb5c
...
...
@@ -137,10 +137,10 @@ func CreateStaffAssessContentRepository(options map[string]interface{}) domain.S
return
repository
.
NewStaffAssessContentRepository
(
transactionContext
)
}
func
CreateStaffAssessTaskRepository
(
options
map
[
string
]
interface
{})
domain
.
StaffAssess
Content
Repository
{
func
CreateStaffAssessTaskRepository
(
options
map
[
string
]
interface
{})
domain
.
StaffAssess
Task
Repository
{
var
transactionContext
*
pg
.
TransactionContext
if
value
,
ok
:=
options
[
"transactionContext"
];
ok
{
transactionContext
=
value
.
(
*
pg
.
TransactionContext
)
}
return
repository
.
NewStaffAssess
Content
Repository
(
transactionContext
)
return
repository
.
NewStaffAssess
Task
Repository
(
transactionContext
)
}
...
...
pkg/application/staff_assess/adapter/search_assess_me.go
查看文件 @
ce5bb5c
...
...
@@ -4,7 +4,7 @@ type SearchAssessMeResp struct {
AssessTaskId
int
`json:"assessTaskId"`
BeginTime
string
`json:"beginTime"`
EndTime
string
`json:"endTime"`
CycleId
int
`json:"cycleId"`
CycleId
int
64
`json:"cycleId"`
CycleName
string
`json:"cycleName"`
EvaluationProjectId
int
`json:"evaluationProjectId"`
EvaluationProjectName
string
`json:"evaluationProjectName"`
...
...
pkg/application/staff_assess/query/assess_task_desc.go
查看文件 @
ce5bb5c
package
query
type
AssessTaskDescQuery
struct
{
AssessTaskId
int
AssessTaskId
int
`json:"assessTaskId"`
//评估任务的id
UserId
int
`json:"userId"`
//当前登录人的id
CompanyId
int
`json:"companyId"`
//当前登录的公司
}
...
...
pkg/application/staff_assess/query/search_assess_me.go
查看文件 @
ce5bb5c
package
query
type
SearchAssessMeQuery
struct
{
UserId
int
// 当前登录人的用户id
CompanyId
int
//当前登录人的公司Id
CurrentTime
string
// 日期 2006-01-02
UserId
int
`json:"userId"`
// 当前登录人的用户id
CompanyId
int
`json:"companyId"`
//当前登录人的公司Id
PageSize
int
`json:"pageSize"`
//每页的记录数
PageNumber
int
`json:"pageNumber"`
//页码
}
...
...
pkg/application/staff_assess/service/service.go
查看文件 @
ce5bb5c
package
service
import
(
"time"
"github.com/linmadan/egglib-go/core/application"
"github.com/linmadan/egglib-go/utils/tool_funs"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
...
...
@@ -13,8 +11,8 @@ import (
type
StaffAssessServeice
struct
{
}
// 获取我参与过的评估项目列表
func
(
srv
StaffAssessServeice
)
SearchAssessMe
(
param
*
query
.
SearchAssessMeQuery
)
(
map
[
string
]
interface
{},
error
)
{
// 获取我参与过的评估任务列表
func
(
srv
StaffAssessServeice
)
SearchAssessTaskMe
(
param
*
query
.
SearchAssessMeQuery
)
(
map
[
string
]
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
...
...
@@ -25,35 +23,45 @@ func (srv StaffAssessServeice) SearchAssessMe(param *query.SearchAssessMeQuery)
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
cycleRepo
:=
factory
.
CreateEvaluationCycle
Repository
(
map
[
string
]
interface
{}{
staffAssessTaskRepo
:=
factory
.
CreateStaffAssessTask
Repository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
currentTime
,
err
:=
time
.
ParseInLocation
(
"2006-01-02"
,
param
.
CurrentTime
,
time
.
Local
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
"时间条件填写错误"
)
var
limit
int
=
20
var
offset
int
=
0
if
param
.
PageSize
>
0
{
limit
=
param
.
PageSize
}
//获取param.CurrentTime 对应的周期
_
,
cycleList
,
err
:=
cycleRepo
.
Find
(
map
[
string
]
interface
{}{
offset
=
(
param
.
PageNumber
-
1
)
*
param
.
PageSize
condition
:=
map
[
string
]
interface
{}{
"executorId"
:
param
.
UserId
,
"companyId"
:
param
.
CompanyId
,
"timeStart"
:
currentTime
,
"timeEnd"
:
currentTime
,
"limit"
:
1
,
})
"limit"
:
limit
,
}
if
offset
>
0
{
condition
[
"offset"
]
=
offset
}
cnt
,
assessTaskList
,
err
:=
staffAssessTaskRepo
.
Find
(
condition
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"查询周期"
+
err
.
Error
())
}
if
len
(
cycleList
)
==
0
{
listData
:=
[]
adapter
.
SearchAssessMeResp
{}
return
tool_funs
.
SimpleWrapGridMap
(
0
,
listData
),
nil
}
//更具周期和param.UserId 获取评估项目列表
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
var
cnt
int64
var
listData
[]
adapter
.
SearchAssessMeResp
return
tool_funs
.
SimpleWrapGridMap
(
cnt
,
listData
),
nil
listData
:=
make
([]
adapter
.
SearchAssessMeResp
,
0
,
len
(
assessTaskList
))
var
temp
adapter
.
SearchAssessMeResp
for
_
,
v
:=
range
assessTaskList
{
temp
=
adapter
.
SearchAssessMeResp
{
AssessTaskId
:
v
.
Id
,
BeginTime
:
v
.
BeginTime
.
Format
(
"2006-01-02 15:04:05"
),
EndTime
:
v
.
EndTime
.
Format
(
"2006-01-02 15:04:05"
),
CycleId
:
v
.
CycleId
,
CycleName
:
v
.
CycleName
,
EvaluationProjectId
:
v
.
EvaluationProjectId
,
EvaluationProjectName
:
v
.
EvaluationProjectName
,
}
listData
=
append
(
listData
,
temp
)
}
return
tool_funs
.
SimpleWrapGridMap
(
int64
(
cnt
),
listData
),
nil
}
// 获取项目评估进度描述
...
...
@@ -98,3 +106,22 @@ func (srv StaffAssessServeice) AssessSelfList(param query.AssessTaskDescQuery) (
result
[
"userInfo"
]
=
userInfo
return
result
,
nil
}
// 更具项目评估的配置,创建员工的评估任务
func
(
srv
StaffAssessServeice
)
CreateStaffAssessTask
()
error
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
return
nil
}
...
...
pkg/domain/staff_assess.go
查看文件 @
ce5bb5c
...
...
@@ -21,7 +21,7 @@ const (
StaffAssessCompleted
StaffAssessStatus
=
"completed"
//已完成
)
// 记录用户需要的评估项
// 记录用户需要的评估项
目
type
StaffAssess
struct
{
Id
int
`json:"id"`
//id
CompanyId
int
`json:"companyId"`
//公司id
...
...
pkg/domain/staff_assess_task.go
查看文件 @
ce5bb5c
...
...
@@ -26,6 +26,7 @@ type StaffAssessTask struct {
BeginTime
time
.
Time
`json:"beginTime"`
//绩效考核开始时间
EndTime
time
.
Time
`json:"endTime"`
//绩效考核截止时间
StepList
[]
AssessTaskStep
`json:"steps"`
//考评的流程
ExecutorId
[]
int
`json:"executorId"`
//参与此次考评的人
CreatedAt
time
.
Time
`json:"createdAt"`
//数据创建时间
UpdatedAt
time
.
Time
`json:"updatedAt"`
//数据更新时间
DeletedAt
time
.
Time
`json:"deletedAt"`
//数据删除时间
...
...
pkg/infrastructure/pg/models/staff_assess_task.go
查看文件 @
ce5bb5c
package
models
import
"time"
import
(
"time"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
)
// 执行评估的任务列表
type
StaffAssessTask
struct
{
...
...
@@ -11,6 +15,8 @@ type StaffAssessTask struct {
EvaluationProjectName
string
``
//项目名称
CycleId
int64
//对应的周期id
CycleName
string
//对应周期的名称
ExecutorId
[]
int
//参与考评的人
StepList
[]
domain
.
AssessTaskStep
``
//考评的流程
BeginTime
time
.
Time
//开始时间
EndTime
time
.
Time
//截止时间
CreatedAt
time
.
Time
//数据创建时间
...
...
pkg/infrastructure/repository/pg_staff_assess_repository.go
查看文件 @
ce5bb5c
...
...
@@ -107,7 +107,7 @@ func (repo *StaffAssessRepository) Find(queryOptions map[string]interface{}) (in
tx
:=
repo
.
transactionContext
.
PgTx
var
m
[]
*
models
.
StaffAssess
query
:=
tx
.
Model
(
&
m
)
.
Where
(
"deleted_at isnull"
)
.
Limit
(
20
)
Where
(
"deleted_at isnull"
)
if
companyId
,
ok
:=
queryOptions
[
"companyId"
];
ok
{
query
.
Where
(
"company_id = ?"
,
companyId
)
}
...
...
@@ -117,7 +117,16 @@ func (repo *StaffAssessRepository) Find(queryOptions map[string]interface{}) (in
if
v
,
ok
:=
queryOptions
[
"offset"
]
.
(
int
);
ok
{
query
.
Offset
(
v
)
}
if
v
,
ok
:=
queryOptions
[
"targetUserId"
]
.
(
int
);
ok
&&
v
>
0
{
query
.
Where
(
`target_user->>'userId'='?'`
,
v
)
}
if
v
,
ok
:=
queryOptions
[
"executorId"
]
.
(
int
);
ok
&&
v
>
0
{
query
.
Where
(
`executor->>'userId'='?'`
,
v
)
}
if
v
,
ok
:=
queryOptions
[
"cycleId"
]
.
(
int64
);
ok
&&
v
>
0
{
query
.
Where
(
`cycle_id=?`
,
v
)
}
count
,
err
:=
query
.
SelectAndCount
()
if
err
!=
nil
{
return
0
,
nil
,
err
...
...
pkg/infrastructure/repository/pg_staff_assess_task_repository.go
查看文件 @
ce5bb5c
...
...
@@ -111,7 +111,9 @@ func (repo *StaffAssessTaskRepository) Find(queryOptions map[string]interface{})
if
v
,
ok
:=
queryOptions
[
"offset"
]
.
(
int
);
ok
{
query
.
Offset
(
v
)
}
if
v
,
ok
:=
queryOptions
[
"executorId"
]
.
(
int
);
ok
&&
v
>
0
{
query
.
Where
(
`executorId @>[?]`
,
v
)
}
count
,
err
:=
query
.
SelectAndCount
()
if
err
!=
nil
{
return
0
,
nil
,
err
...
...
请
注册
或
登录
后发表评论