切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
庄敏学
2 years ago
提交
b92074a8f26f0011ae9e5c406c89486729da7775
2 个父辈
5971e2ea
498167c3
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
用户增加字段entryTime
隐藏空白字符变更
内嵌
并排对比
正在显示
52 个修改的文件
包含
1123 行增加
和
352 行删除
main.go
pkg/application/evaluation_cycle/command/cycle_query.go
pkg/application/evaluation_cycle/cycle_service.go
pkg/application/evaluation_project/command/project_query.go
pkg/application/evaluation_rule/command/rule_query.go
pkg/application/evaluation_rule/command/rule_update.go
pkg/application/evaluation_rule/rule_service.go
pkg/application/evaluation_template/command/template_query.go
pkg/application/evaluation_template/template_service.go
pkg/application/role/adapter/role_adapter.go
pkg/application/role/command/role_query_user.go
pkg/application/role/role_service.go
pkg/application/role/role_user_service.go
pkg/application/staff_assess/adapter/assess_info.go
pkg/application/staff_assess/adapter/assess_invite_user.go
pkg/application/staff_assess/adapter/list_invite_user_assess.go
pkg/application/staff_assess/adapter/list_supper_assess.go
pkg/application/staff_assess/adapter/select_invite_user.go
pkg/application/staff_assess/query/assess_info.go
pkg/application/staff_assess/query/assess_self_info.go
pkg/application/staff_assess/query/get_assess_invite_user.go
pkg/application/staff_assess/query/list_invite_user_assess copy.go
pkg/application/staff_assess/query/list_invite_user_assess.go
pkg/application/staff_assess/query/select_assess_invite_user.go
pkg/application/staff_assess/service/service.go
pkg/domain/evaluation_cycle.go
pkg/domain/evaluation_cycle_template.go
pkg/domain/evaluation_template.go
pkg/domain/role.go
pkg/domain/staff_assess_content.go
pkg/domain/user.go
pkg/infrastructure/pg/init.go
pkg/infrastructure/pg/models/evaluation_cycle_template.go
pkg/infrastructure/pg/models/evaluation_rule.go
pkg/infrastructure/pg/models/role.go
pkg/infrastructure/pg/models/role_user.go
pkg/infrastructure/pg/models/staff_assess_content.go
pkg/infrastructure/pg/models/user.go
pkg/infrastructure/repository/pg_evaluation_cycle_template_repository.go
pkg/infrastructure/repository/pg_evaluation_template_repository.go
pkg/infrastructure/repository/pg_role_user_repository.go
pkg/infrastructure/repository/pg_staff_assess_content_repository.go
pkg/infrastructure/repository/pg_staff_assess_repository.go
pkg/infrastructure/repository/pg_user_repository.go
pkg/port/beego/controllers/evaluation_cycle_controller.go
pkg/port/beego/controllers/evaluation_rule_controller.go
pkg/port/beego/controllers/evaluation_template_controller.go
pkg/port/beego/controllers/role_controller.go
pkg/port/beego/controllers/staff_assess_controller.go
pkg/port/beego/routers/evaluation_cycle_router.go
pkg/port/beego/routers/role_router.go
pkg/port/beego/routers/staff_assess_router.go
main.go
查看文件 @
b92074a
package
main
import
(
"fmt"
"github.com/beego/beego/v2/server/web"
_
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/port/beego"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/port/consumer"
)
func
main
()
{
tree
:=
web
.
PrintTree
()
methods
:=
tree
[
"Data"
]
.
(
web
.
M
)
for
k
,
v
:=
range
methods
{
fmt
.
Printf
(
"%s => %v
\n
"
,
k
,
v
)
}
// tree := web.PrintTree()
// methods := tree["Data"].(web.M)
// for k, v := range methods {
// fmt.Printf("%s => %v \n", k, v)
// }
go
consumer
.
Run
()
web
.
Run
()
}
...
...
pkg/application/evaluation_cycle/command/cycle_query.go
查看文件 @
b92074a
...
...
@@ -5,8 +5,22 @@ import "github.com/beego/beego/v2/core/validation"
type
QueryCycleCommand
struct
{
CompanyId
int64
`cname:"公司ID" json:"companyId"`
Name
string
`cname:"周期名称" json:"name"`
PageNumber
int
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int
`cname:"分页数量" json:"pageSize" valid:"Required"`
PageNumber
int64
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int64
`cname:"分页数量" json:"pageSize" valid:"Required"`
}
type
StatisticCycleProjectUserCommand
struct
{
CompanyId
int64
`cname:"公司ID" json:"companyId"`
CycleId
int64
`cname:"周期ID" json:"cycleId,string"`
}
type
CycleTemplateListCommand
struct
{
CycleId
int64
`cname:"周期ID" json:"cycleId,string" valid:"Required"`
}
type
CycleTemplateCommand
struct
{
CycleId
int64
`cname:"周期ID" json:"cycleId,string" valid:"Required"`
TemplateId
int64
`cname:"模板ID" json:"templateId,string" valid:"Required"`
}
func
(
in
*
QueryCycleCommand
)
Valid
(
validation
*
validation
.
Validation
)
{
...
...
@@ -16,11 +30,14 @@ func (in *QueryCycleCommand) Valid(validation *validation.Validation) {
}
}
type
StatisticCycleProjectUserCommand
struct
{
CompanyId
int64
`cname:"公司ID" json:"companyId"`
CycleId
int64
`cname:"周期ID" json:"cycleId,string"`
func
(
in
*
StatisticCycleProjectUserCommand
)
Valid
(
*
validation
.
Validation
)
{
}
func
(
in
*
StatisticCycleProjectUserCommand
)
Valid
(
*
validation
.
Validation
)
{
func
(
in
*
CycleTemplateListCommand
)
Valid
(
*
validation
.
Validation
)
{
}
func
(
in
*
CycleTemplateCommand
)
Valid
(
*
validation
.
Validation
)
{
}
...
...
pkg/application/evaluation_cycle/cycle_service.go
查看文件 @
b92074a
...
...
@@ -98,12 +98,13 @@ func (rs *EvaluationCycleService) Create(in *command.CreateCycleCommand) (interf
}
}
//
插入周期中的模板
数据
//
周期模板数据表中插入
数据
cycleTemplate
:=
&
domain
.
EvaluationCycleTemplate
{
Id
:
0
,
Name
:
v
.
Name
,
Template
:
v
,
CycleId
:
cycle
.
Id
,
Id
:
0
,
Name
:
v
.
Name
,
TemplateCreatedAt
:
v
.
CreatedAt
,
Template
:
v
,
CycleId
:
cycle
.
Id
,
}
_
,
err
:=
cycleTemplateRepository
.
Insert
(
cycleTemplate
)
if
err
!=
nil
{
...
...
@@ -114,7 +115,7 @@ func (rs *EvaluationCycleService) Create(in *command.CreateCycleCommand) (interf
ctAdapter
.
TemplateSimples
=
append
(
ctAdapter
.
TemplateSimples
,
&
domain
.
TemplateSimple
{
Id
:
cycleTemplate
.
Id
,
Name
:
cycleTemplate
.
Name
,
CreatedAt
:
cycleTemplate
.
CreatedAt
,
CreatedAt
:
cycleTemplate
.
TemplateCreatedAt
,
// 模板创建时间
})
}
...
...
@@ -188,10 +189,11 @@ func (rs *EvaluationCycleService) Update(in *command.UpdateCycleCommand) (interf
for
i
:=
range
templates
{
v
:=
templates
[
i
]
cycleTemplate
:=
&
domain
.
EvaluationCycleTemplate
{
Id
:
0
,
Name
:
v
.
Name
,
Template
:
v
,
CycleId
:
cycle
.
Id
,
Id
:
0
,
Name
:
v
.
Name
,
TemplateCreatedAt
:
v
.
CreatedAt
,
Template
:
v
,
CycleId
:
cycle
.
Id
,
}
_
,
err
:=
cycleTemplateRepository
.
Insert
(
cycleTemplate
)
if
err
!=
nil
{
...
...
@@ -220,7 +222,7 @@ func (rs *EvaluationCycleService) Update(in *command.UpdateCycleCommand) (interf
ctAdapter
.
TemplateSimples
=
append
(
ctAdapter
.
TemplateSimples
,
&
domain
.
TemplateSimple
{
Id
:
cycleTemplates
[
i
]
.
Id
,
Name
:
cycleTemplates
[
i
]
.
Name
,
CreatedAt
:
cycleTemplates
[
i
]
.
CreatedAt
,
CreatedAt
:
cycleTemplates
[
i
]
.
Template
CreatedAt
,
})
}
...
...
@@ -257,7 +259,7 @@ func (rs *EvaluationCycleService) Get(in *command.GetCycleCommand) (interface{},
ctAdapter
.
TemplateSimples
=
append
(
ctAdapter
.
TemplateSimples
,
&
domain
.
TemplateSimple
{
Id
:
cycleTemplates
[
i
]
.
Id
,
Name
:
cycleTemplates
[
i
]
.
Name
,
CreatedAt
:
cycleTemplates
[
i
]
.
CreatedAt
,
CreatedAt
:
cycleTemplates
[
i
]
.
Template
CreatedAt
,
})
}
...
...
@@ -361,3 +363,53 @@ func (rs *EvaluationCycleService) StatisticCycleUser(in *command.StatisticCycleP
}
return
map
[
string
]
interface
{}{
"userTotal"
:
userTotal
,
"departmentTotal"
:
departmentTotal
},
nil
}
func
(
rs
*
EvaluationCycleService
)
CycleTemplateList
(
in
*
command
.
CycleTemplateListCommand
)
(
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
ValidateStartTransaction
(
in
)
if
err
!=
nil
{
return
nil
,
err
}
defer
func
()
{
transactionContext
.
RollbackTransaction
()
}()
cycleTemplateRepository
:=
factory
.
CreateEvaluationCycleTemplateRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
_
,
cycleTemplates
,
err
:=
cycleTemplateRepository
.
Find
(
map
[
string
]
interface
{}{
"cycleId"
:
in
.
CycleId
},
"template"
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
list
:=
make
([]
*
domain
.
TemplateSimple
,
0
)
for
i
:=
range
cycleTemplates
{
list
=
append
(
list
,
&
domain
.
TemplateSimple
{
Id
:
cycleTemplates
[
i
]
.
Id
,
Name
:
cycleTemplates
[
i
]
.
Name
,
CreatedAt
:
cycleTemplates
[
i
]
.
TemplateCreatedAt
,
})
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
return
map
[
string
]
interface
{}{
"list"
:
list
},
nil
}
func
(
rs
*
EvaluationCycleService
)
CycleTemplate
(
in
*
command
.
CycleTemplateCommand
)
(
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
ValidateStartTransaction
(
in
)
if
err
!=
nil
{
return
nil
,
err
}
defer
func
()
{
transactionContext
.
RollbackTransaction
()
}()
cycleTemplateRepository
:=
factory
.
CreateEvaluationCycleTemplateRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
cycleTemplate
,
err
:=
cycleTemplateRepository
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
in
.
TemplateId
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
return
cycleTemplate
.
Template
,
nil
}
...
...
pkg/application/evaluation_project/command/project_query.go
查看文件 @
b92074a
...
...
@@ -8,8 +8,8 @@ type QueryProjectCommand struct {
Name
string
`cname:"项目名称" json:"name"`
State
int
`cname:"项目状态" json:"state"`
PmpIds
[]
string
`cname:"项目管理员ID" json:"pmpIds"`
PageNumber
int
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int
`cname:"分页数量" json:"pageSize" valid:"Required"`
PageNumber
int64
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int64
`cname:"分页数量" json:"pageSize" valid:"Required"`
}
func
(
in
*
QueryProjectCommand
)
Valid
(
validation
*
validation
.
Validation
)
{
...
...
pkg/application/evaluation_rule/command/rule_query.go
查看文件 @
b92074a
...
...
@@ -7,8 +7,8 @@ type QueryRuleCommand struct {
NameOrRemark
string
`cname:"规则名称或备注" json:"nameOrRemark"`
Type
int
`cname:"评估方式(0评级、1评分)" json:"type"`
CreatorId
int64
`cname:"创建人ID" json:"creatorId,string"`
PageNumber
int
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int
`cname:"分页数量" json:"pageSize" valid:"Required"`
PageNumber
int64
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int64
`cname:"分页数量" json:"pageSize" valid:"Required"`
}
func
(
in
*
QueryRuleCommand
)
Valid
(
validation
*
validation
.
Validation
)
{
...
...
pkg/application/evaluation_rule/command/rule_update.go
查看文件 @
b92074a
...
...
@@ -8,7 +8,6 @@ import (
type
UpdateRuleCommand
struct
{
Id
int64
`cname:"规则ID" json:"id,string" valid:"Required"`
CompanyId
int64
`cname:"公司ID" json:"companyId"`
CreatorId
int64
`cname:"创建人ID" json:"creatorId"`
Name
string
`cname:"规则名称" json:"name" valid:"Required"`
Remark
string
`cname:"规则备注" json:"remark"`
Type
int
`cname:"评估方式" json:"type"`
...
...
@@ -21,10 +20,6 @@ func (in *UpdateRuleCommand) Valid(validation *validation.Validation) {
validation
.
SetError
(
"companyId"
,
"公司ID无效"
)
return
}
if
in
.
CreatorId
==
0
{
validation
.
SetError
(
"creatorId"
,
"创建人ID无效"
)
return
}
if
len
(
in
.
Name
)
>
40
{
validation
.
SetError
(
"name"
,
"名称最大长度40个字符"
)
...
...
pkg/application/evaluation_rule/rule_service.go
查看文件 @
b92074a
...
...
@@ -35,7 +35,7 @@ func (rs *EvaluationRuleService) Create(in *command.CreateRuleCommand) (interfac
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
count
>
0
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"
名称已存在
"
)
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"
已存在相同名称的评估规则
"
)
}
if
in
.
Type
==
domain
.
EvaluationTypeRating
{
// 按等级量化值排序
...
...
@@ -82,7 +82,7 @@ func (rs *EvaluationRuleService) Update(in *command.UpdateRuleCommand) (interfac
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
count
>
0
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"
名称已存在
"
)
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"
已存在相同名称的评估规则
"
)
}
rule
,
err
:=
ruleRepository
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
in
.
Id
})
...
...
pkg/application/evaluation_template/command/template_query.go
查看文件 @
b92074a
...
...
@@ -10,8 +10,8 @@ type QueryTemplateCommand struct {
Name
string
`cname:"模板名称" json:"name"`
State
int
`cname:"模板状态" json:"state"`
CreatedAt
*
time
.
Time
`cname:"创建时间" json:"createdAt"`
PageNumber
int
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int
`cname:"分页数量" json:"pageSize" valid:"Required"`
PageNumber
int64
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int64
`cname:"分页数量" json:"pageSize" valid:"Required"`
}
func
(
in
*
QueryTemplateCommand
)
Valid
(
validation
*
validation
.
Validation
)
{
...
...
@@ -20,15 +20,3 @@ func (in *QueryTemplateCommand) Valid(validation *validation.Validation) {
return
}
}
//// AllEnableTemplateCommand 查询所有已启用的模板
//type AllEnableTemplateCommand struct {
// CompanyId int64 `cname:"公司ID" json:"companyId"`
//}
//
//func (in *AllEnableTemplateCommand) Valid(validation *validation.Validation) {
// if in.CompanyId == 0 {
// validation.SetError("companyId", "公司ID无效")
// return
// }
//}
...
...
pkg/application/evaluation_template/template_service.go
查看文件 @
b92074a
...
...
@@ -34,41 +34,46 @@ func (rs *EvaluationTemplateService) Create(in *command.CreateTemplateCommand) (
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
count
>
0
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"
名称已存在
"
)
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"
已存在相同名称的评估模板
"
)
}
linkNodes
:=
make
([]
*
domain
.
LinkNode
,
0
)
sid
,
_
:=
utils
.
NewSnowflakeId
()
linkNodes
=
append
(
linkNodes
,
&
domain
.
LinkNode
{
Id
:
sid
+
1
,
Type
:
domain
.
LinkNodeSelfAssessment
,
Name
:
"填写自评反馈"
,
KpiCycle
:
domain
.
KpiCycleDay
,
Id
:
sid
+
1
,
Type
:
domain
.
LinkNodeSelfAssessment
,
Name
:
"填写自评反馈"
,
NodeContents
:
make
([]
*
domain
.
NodeContent
,
0
),
KpiCycle
:
domain
.
KpiCycleDay
,
})
linkNodes
=
append
(
linkNodes
,
&
domain
.
LinkNode
{
Id
:
sid
+
2
,
Type
:
domain
.
LinkNodeAllInvite
,
Name
:
"360°邀请"
,
KpiCycle
:
domain
.
KpiCycleDay
,
Id
:
sid
+
2
,
Type
:
domain
.
LinkNodeAllInvite
,
Name
:
"360°邀请"
,
NodeContents
:
make
([]
*
domain
.
NodeContent
,
0
),
KpiCycle
:
domain
.
KpiCycleDay
,
})
linkNodes
=
append
(
linkNodes
,
&
domain
.
LinkNode
{
Id
:
sid
+
3
,
Type
:
domain
.
LinkNodeAllAssessment
,
Name
:
"360°评估"
,
KpiCycle
:
domain
.
KpiCycleDay
,
Id
:
sid
+
3
,
Type
:
domain
.
LinkNodeAllAssessment
,
Name
:
"360°评估"
,
NodeContents
:
make
([]
*
domain
.
NodeContent
,
0
),
KpiCycle
:
domain
.
KpiCycleDay
,
})
linkNodes
=
append
(
linkNodes
,
&
domain
.
LinkNode
{
Id
:
sid
+
4
,
Type
:
domain
.
LinkNodeSuperiorAssessment
,
Name
:
"上级评估"
,
KpiCycle
:
domain
.
KpiCycleDay
,
Id
:
sid
+
4
,
Type
:
domain
.
LinkNodeSuperiorAssessment
,
Name
:
"上级评估"
,
NodeContents
:
make
([]
*
domain
.
NodeContent
,
0
),
KpiCycle
:
domain
.
KpiCycleDay
,
})
linkNodes
=
append
(
linkNodes
,
&
domain
.
LinkNode
{
Id
:
sid
+
5
,
Type
:
domain
.
LinkNodeViewResult
,
Name
:
"绩效结果查看"
,
KpiCycle
:
domain
.
KpiCycleDay
,
Id
:
sid
+
5
,
Type
:
domain
.
LinkNodeViewResult
,
Name
:
"绩效结果查看"
,
NodeContents
:
make
([]
*
domain
.
NodeContent
,
0
),
KpiCycle
:
domain
.
KpiCycleDay
,
})
newTemplate
:=
&
domain
.
EvaluationTemplate
{
...
...
@@ -183,8 +188,14 @@ func (rs *EvaluationTemplateService) List(in *command.QueryTemplateCommand) (int
defer
func
()
{
transactionContext
.
RollbackTransaction
()
}()
queryOptions
:=
tool_funs
.
SimpleStructToMap
(
in
)
if
in
.
CreatedAt
==
nil
{
delete
(
queryOptions
,
"createdAt"
)
// 删除创建时间
}
templateRepository
:=
factory
.
CreateEvaluationTemplateRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
total
,
templates
,
err
:=
templateRepository
.
Find
(
tool_funs
.
SimpleStructToMap
(
in
),
"linkN
odes"
)
total
,
templates
,
err
:=
templateRepository
.
Find
(
queryOptions
,
"link_n
odes"
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
...
...
pkg/application/role/adapter/role_adapter.go
查看文件 @
b92074a
...
...
@@ -5,6 +5,6 @@ import (
)
type
RoleUserAdapter
struct
{
domain
.
Role
*
domain
.
Role
Users
[]
*
domain
.
RoleContainUser
`json:"users"`
}
...
...
pkg/application/role/command/role_query_user.go
查看文件 @
b92074a
...
...
@@ -5,8 +5,8 @@ import "github.com/beego/beego/v2/core/validation"
// QueryRoleUserCommand 查询角色列表(关联用户)
type
QueryRoleUserCommand
struct
{
CompanyId
int64
`cname:"公司ID" json:"companyId"`
PageNumber
int
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int
`cname:"分页数量" json:"pageSize" valid:"Required"`
PageNumber
int64
`cname:"分页页码" json:"pageNumber" valid:"Required"`
PageSize
int64
`cname:"分页数量" json:"pageSize" valid:"Required"`
}
func
(
in
*
QueryRoleUserCommand
)
Valid
(
validation
*
validation
.
Validation
)
{
...
...
pkg/application/role/role_service.go
查看文件 @
b92074a
...
...
@@ -6,6 +6,7 @@ import (
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/factory"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role/adapter"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/role/command"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
)
type
RoleService
struct
{
...
...
@@ -91,47 +92,53 @@ func NewRoleService() *RoleService {
// return role, nil
//}
//
//func (rs *RoleService) Remove(in *command.DeleteRoleCommand) (interface{}, error) {
// transactionContext, err := factory.ValidateStartTransaction(in)
// if err != nil {
// return nil, err
// }
// defer func() {
// transactionContext.RollbackTransaction()
// }()
//
// roleRepository := factory.CreateRoleRepository(map[string]interface{}{"transactionContext": transactionContext})
// roleUserRepository := factory.CreateRoleUserRepository(map[string]interface{}{"transactionContext": transactionContext})
//
// role, err := roleRepository.FindOne(map[string]interface{}{"id": in.Id})
// if err != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
// }
// if _, err := roleRepository.Remove(role); err != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
// }
//
// // 获取角色所有关联的用户,并删除
// _, roleUsers, err := roleUserRepository.Find(map[string]interface{}{"roleId": in.Id, "companyId": in.CompanyId})
// if err != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
// }
// ids := make([]int64, 0)
// for i := range roleUsers {
// ids = append(ids, roleUsers[i].Id)
// }
// if len(ids) > 0 {
// err := roleUserRepository.BatchDeleteById(ids)
// if err != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
// }
// }
//
// if err := transactionContext.CommitTransaction(); err != nil {
// return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
// }
// return role, nil
//}
func
(
rs
*
RoleService
)
Remove
(
in
*
command
.
DeleteRoleCommand
)
(
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
ValidateStartTransaction
(
in
)
if
err
!=
nil
{
return
nil
,
err
}
defer
func
()
{
transactionContext
.
RollbackTransaction
()
}()
roleRepository
:=
factory
.
CreateRoleRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
roleUserRepository
:=
factory
.
CreateRoleUserRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
role
,
err
:=
roleRepository
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
in
.
Id
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
role
.
Type
==
domain
.
RoleTypeSystem
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"系统预制角色不可删除"
)
}
if
_
,
err
:=
roleRepository
.
Remove
(
role
);
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 获取角色所有关联的用户,并删除
_
,
roleUsers
,
err
:=
roleUserRepository
.
Find
(
map
[
string
]
interface
{}{
"roleId"
:
in
.
Id
,
"companyId"
:
in
.
CompanyId
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
ids
:=
make
([]
int64
,
0
)
for
i
:=
range
roleUsers
{
ids
=
append
(
ids
,
roleUsers
[
i
]
.
Id
)
}
if
len
(
ids
)
>
0
{
err
:=
roleUserRepository
.
BatchDeleteById
(
ids
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
return
role
,
nil
}
func
(
rs
*
RoleService
)
ListForUser
(
in
*
command
.
QueryRoleUserCommand
)
(
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
StartTransaction
()
...
...
@@ -150,11 +157,37 @@ func (rs *RoleService) ListForUser(in *command.QueryRoleUserCommand) (interface{
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
len
(
roles
)
==
0
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
"未找到角色数据"
)
}
adapterList
:=
make
([]
*
adapter
.
RoleUserAdapter
,
0
)
// 如果不存在系统预支hrbp角色时,插入一条数据
var
havaSystemType
=
false
for
i
:=
range
roles
{
if
roles
[
i
]
.
Type
==
domain
.
RoleTypeSystem
{
havaSystemType
=
true
break
}
}
if
!
havaSystemType
{
role
:=
&
domain
.
Role
{
Id
:
0
,
Name
:
"HRBP"
,
Type
:
domain
.
RoleTypeSystem
,
Description
:
"拥有全部权限,预置角色不可删除"
,
CompanyId
:
in
.
CompanyId
,
}
role
,
err
=
roleRepository
.
Insert
(
role
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 创建HRBP角色
roleUser
:=
&
adapter
.
RoleUserAdapter
{}
roleUser
.
Role
=
role
roleUser
.
Users
=
make
([]
*
domain
.
RoleContainUser
,
0
)
adapterList
=
append
(
adapterList
,
roleUser
)
}
for
i
:=
range
roles
{
v
:=
roles
[
i
]
tempList
,
err
:=
ruRepository
.
FindAllContainUser
(
1
,
10
,
in
.
CompanyId
,
v
.
Id
)
...
...
@@ -162,13 +195,14 @@ func (rs *RoleService) ListForUser(in *command.QueryRoleUserCommand) (interface{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
roleUser
:=
&
adapter
.
RoleUserAdapter
{}
roleUser
.
Id
=
v
.
Id
roleUser
.
Name
=
v
.
Name
roleUser
.
Type
=
v
.
Type
roleUser
.
Description
=
v
.
Description
roleUser
.
CompanyId
=
v
.
CompanyId
roleUser
.
Role
=
v
roleUser
.
Users
=
tempList
adapterList
=
append
(
adapterList
,
roleUser
)
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
return
tool_funs
.
SimpleWrapGridMap
(
int64
(
len
(
adapterList
)),
adapterList
),
nil
}
...
...
pkg/application/role/role_user_service.go
查看文件 @
b92074a
...
...
@@ -28,6 +28,11 @@ func (rs *RoleUserService) Create(in *command.UserRoleCreateCommand) (interface{
}()
roleUserRepository
:=
factory
.
CreateRoleUserRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
})
//int64Array := make([]int64, 0)
//for i := range in.UserIds {
// int64Num, _ := strconv.ParseInt(in.UserIds[i], 10, 64)
// int64Array = append(int64Array, int64Num)
//}
// 检测已存在的关联用户
_
,
rus
,
err
:=
roleUserRepository
.
Find
(
map
[
string
]
interface
{}{
"roleId"
:
in
.
RoleId
,
"companyId"
:
in
.
CompanyId
,
"userIds"
:
in
.
UserIds
,
"limit"
:
9999999
})
if
err
!=
nil
{
...
...
pkg/application/staff_assess/adapter/assess_info.go
查看文件 @
b92074a
...
...
@@ -4,22 +4,35 @@ import "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
//评估内容详情
type
AssessInfoResp
struct
{
CycleId
int64
`json:"cycleId"`
//周期id
CycleName
string
`json:"cycleName"`
//周期名称
EvaluationProjectId
int
`json:"evaluationProjectId"`
//项目id
EvaluationProjectName
string
`json:"evaluationProjectName"`
//项目名称
BeginTime
string
`json:"beginTime"`
//开始时间 2006-01-02 15:04:05
EndTime
string
`json:"endTime"`
//结束时间 2006-01-02 15:04:05
Status
string
`json:"status"`
//完成状态
TargetUserId
int
`json:"targetUser"`
//
TargetUserName
string
`json:"targetUserName"`
//
AssessContent
[]
AssessContent
`json:"assessContent"`
//评估内容
AssessId
int
`json:"assessId"`
CycleId
int64
`json:"cycleId"`
//周期id
CycleName
string
`json:"cycleName"`
//周期名称
EvaluationProjectId
int
`json:"evaluationProjectId"`
//项目id
EvaluationProjectName
string
`json:"evaluationProjectName"`
//项目名称
BeginTime
string
`json:"beginTime"`
//开始时间 2006-01-02 15:04:05
EndTime
string
`json:"endTime"`
//结束时间 2006-01-02 15:04:05
Status
string
`json:"status"`
//完成状态
TargetUserId
int
`json:"targetUser"`
//目标用户
TargetUserName
string
`json:"targetUserName"`
//目标用户名称
CompanyId
int
`json:"companyId,string"`
//
CompanyName
string
`json:"companyName"`
//公司名称
SupperUser
string
`json:"superUser"`
//目标用户的上级
DutyTime
string
`json:"dutyTime"`
//入职时间 //
AssessContent
[]
*
domain
.
StaffAssessContent
`json:"assessContent"`
//评估内容
}
type
AssessContent
struct
{
Category
string
`json:"category" comment:"类别"`
Name
string
`json:"name" comment:"名称"`
PromptTitle
string
`json:"promptTitle" comment:"提示项标题"`
PromptText
string
`json:"promptText" comment:"提示项正文"`
EntryItems
[]
*
domain
.
EntryItem
`json:"entryItems" comment:"填写项"`
Category
string
`json:"category"`
//comment:"类别"
Name
string
`json:"name"`
// comment:"名称"
PromptTitle
string
`json:"promptTitle"`
//comment:"提示项标题"
PromptText
string
`json:"promptText"`
// comment:"提示项正文"
Rule
AssessContentRule
`json:"rules"`
//评定规则
Value
string
`json:"value"`
// 实际填写评定值
Remark
[]
domain
.
AssessContemtRemark
`json:"entryItems"`
// comment:"填写反馈"
}
type
AssessContentRule
struct
{
Types
int
`json:"types"`
//评估方式(0评级、1评分)
Rating
domain
.
Rating
`json:"rating"`
//评级
Score
domain
.
Score
`json:"score"`
//评分
}
...
...
pkg/application/staff_assess/adapter/assess_invite_user.go
查看文件 @
b92074a
...
...
@@ -2,6 +2,7 @@ package adapter
import
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
//获取评估的邀请人
type
AssessInviteUserResp
struct
{
LinkNodeId
int
`json:"linkNodeId"`
LinkNodeName
string
`json:"linkNodeName"`
...
...
pkg/application/staff_assess/adapter/list_invite_user_assess.go
0 → 100644
查看文件 @
b92074a
package
adapter
type
ListInviteUserAssessResp
struct
{
TableHeader
[]
ListTableHeader
List
[]
map
[
string
]
string
Total
int
}
type
ListTableHeader
struct
{
Key
string
Name
string
}
...
...
pkg/application/staff_assess/adapter/list_supper_assess.go
0 → 100644
查看文件 @
b92074a
package
adapter
type
ListSupperAssessResp
struct
{
AssessId
int
`json:"assessId"`
//
UserName
string
`json:"userName"`
//用户名称
EndTime
string
`json:"endTime"`
//截止时间
InviteTotal
int
`json:"inviteCompleted"`
//邀请总数
InviteUncompleted
int
`json:"inviteUncompleted"`
//邀请未完成
Department
string
`json:"department"`
//部门
Position
string
`json:"position"`
//职位
DutyTime
string
`json:"dutyTime"`
//入职时间
}
...
...
pkg/application/staff_assess/adapter/select_invite_user.go
0 → 100644
查看文件 @
b92074a
package
adapter
type
SelectInviteUser
struct
{
UserId
int
`json:"userId,string"`
UserName
string
`json:"userName"`
//
IsSupper
bool
`json:"isSupper"`
// 是否,是直属上级
Types
int
`json:"types"`
// 1:相同上级的同事 2:不相同上级的同事
}
...
...
pkg/application/staff_assess/query/assess_info.go
查看文件 @
b92074a
package
query
//获取评估任务详情
type
AssessInfoQuery
struct
{
AssessTaskId
int
`json:"assessTaskId"`
//StaffAssess 的id
TargetUserId
int
`json:"targetUserId"`
//被评估的人id
CompanyId
int
`json:"companyId"`
//公司id
AssessId
int
`json:"assessId"`
//
CompanyId
int
`json:"companyId"`
//
}
...
...
pkg/application/staff_assess/query/assess_self_info.go
0 → 100644
查看文件 @
b92074a
package
query
//获取员工自评填写详情
type
AssessSelfInfoQuery
struct
{
AssessTaskId
int
`json:"assessTaskId"`
//StaffAssess 的id
TargetUserId
int
`json:"targetUserId"`
//被评估的人id
CompanyId
int
`json:"companyId"`
//公司id
}
...
...
pkg/application/staff_assess/query/get_assess_invite_user.go
查看文件 @
b92074a
...
...
@@ -2,6 +2,6 @@ package query
type
GetAssessInviteUserQuery
struct
{
CompanyId
int
`json:"companyId"`
//对公司
Us
rId
int
`json:"usrId"`
//被评估的员工id
Us
erId
int
`json:"userId"`
//被评估的员工id
AssessTaskId
int
`json:"assessTaskId"`
//评估任务的id
}
...
...
pkg/application/staff_assess/query/list_invite_user_assess copy.go
0 → 100644
查看文件 @
b92074a
package
query
type
ListSupperAssessQuery
struct
{
PageNumber
int
`json:"pageNumber"`
PageSize
int
`json:"pageSize"`
UserName
string
`json:"userName"`
//查询条件 员工的名称
CompanyId
int
`json:"companyId"`
//
ExecutorId
int
`json:"executorId"`
//评估的执行人
AssessTaskkId
int
`json:"assessTaskId"`
//评估任务id
}
...
...
pkg/application/staff_assess/query/list_invite_user_assess.go
0 → 100644
查看文件 @
b92074a
package
query
type
ListInviteUserAssessQuery
struct
{
PageNumber
int
`json:"pageNumber"`
PageSize
int
`json:"pageSize"`
UserName
string
`json:"userName"`
//查询条件 员工的名称
CompanyId
int
`json:"companyId"`
//
ExecutorId
int
`json:"executorId"`
//评估的执行人
AssessTaskkId
int
`json:"assessTaskId"`
//评估任务id
}
...
...
pkg/application/staff_assess/query/select_assess_invite_user.go
0 → 100644
查看文件 @
b92074a
package
query
type
SelectAssessInviteUser
struct
{
TargetUserId
int
`json:"targetUserId"`
//被评估的员工userId
CompanyId
int
`json:"companyId"`
InviteUserName
string
`json:"inviteUserName"`
PageSize
int
`json:"pageSize"`
PageNumber
int
`json:"pageNumber"`
}
...
...
pkg/application/staff_assess/service/service.go
查看文件 @
b92074a
...
...
@@ -575,7 +575,7 @@ func (srv StaffAssessServeice) GetAssessInviteUser(param *query.GetAssessInviteU
_
,
assessList
,
err
:=
assessReps
.
Find
(
map
[
string
]
interface
{}{
"typesList"
:
[]
string
{
string
(
domain
.
AssessInviteDiffSuper
),
string
(
domain
.
AssessInviteSameSuper
)},
"staffAssessTaskId"
:
param
.
AssessTaskId
,
"targetUserId"
:
param
.
UsrId
,
"targetUserId"
:
param
.
Us
e
rId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
"获取个人评估任务"
+
err
.
Error
())
...
...
@@ -585,7 +585,9 @@ func (srv StaffAssessServeice) GetAssessInviteUser(param *query.GetAssessInviteU
}
result
:=
adapter
.
AssessInviteUserResp
{
AssessTaskId
:
assessTaskData
.
Id
,
AssessTaskId
:
assessTaskData
.
Id
,
InviteDiffSuper
:
[]
domain
.
StaffDesc
{},
InviteSameSuper
:
[]
domain
.
StaffDesc
{},
}
for
_
,
v
:=
range
assessTaskData
.
StepList
{
if
v
.
LinkNodeType
!=
domain
.
LinkNodeAllInvite
{
...
...
@@ -608,8 +610,8 @@ func (srv StaffAssessServeice) GetAssessInviteUser(param *query.GetAssessInviteU
return
&
result
,
nil
}
// 获取某个员工360邀请的人员
func
(
srv
StaffAssessServeice
)
SaveAssessInviteUser
(
param
*
command
.
SaveAssessInvite
)
(
*
adapter
.
AssessInviteUserResp
,
error
)
{
// 保存某个员工360邀请的人员
func
(
srv
StaffAssessServeice
)
SaveAssessInviteUser
(
param
*
command
.
SaveAssessInvite
)
(
map
[
string
]
interface
{},
error
)
{
inviteSameSuperId
:=
[]
int
{}
InviteDiffSuperId
:=
[]
int
{}
for
_
,
v
:=
range
param
.
InviteDiffSuper
{
...
...
@@ -657,6 +659,19 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv
return
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
"获取评估任务"
+
err
.
Error
())
}
//获取邀请评估的节点
var
inviteNode
*
domain
.
AssessTaskStep
for
_
,
v
:=
range
assessTaskData
.
StepList
{
if
v
.
LinkNodeType
==
domain
.
LinkNodeAllAssessment
{
cp
:=
v
inviteNode
=
&
cp
break
}
}
if
inviteNode
==
nil
{
return
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
"评估任务没有邀请评估的环节"
)
}
targetUser
,
err
:=
userRepo
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
param
.
TargetUserId
,
})
...
...
@@ -713,50 +728,108 @@ func (srv StaffAssessServeice) SaveAssessInviteUser(param *command.SaveAssessInv
})
}
}
_
=
assessReps
_
=
inviteSameSuper
_
=
inviteDiffSuper
_
=
targetUserDepartment
// _, assessList, err := assessReps.Find(map[string]interface{}{
// "typesList": []string{string(domain.AssessInviteDiffSuper), string(domain.AssessInviteSameSuper)},
// "staffAssessTaskId": param.AssessTaskId,
// "targetUserId": param.TargetUserId,
// })
// if err != nil {
// return nil, application.ThrowError(application.ARG_ERROR, "获取个人评估任务"+err.Error())
// }
// TODO
//获取员工邀请的人
_
,
assessList
,
err
:=
assessReps
.
Find
(
map
[
string
]
interface
{}{
"typesList"
:
[]
string
{
string
(
domain
.
AssessInviteDiffSuper
),
string
(
domain
.
AssessInviteSameSuper
)},
"staffAssessTaskId"
:
param
.
AssessTaskId
,
"targetUserId"
:
param
.
TargetUserId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
"获取员工邀请的人"
+
err
.
Error
())
}
//比对新旧数据
nowTime
:=
time
.
Now
()
assessMap
:=
map
[
string
]
*
domain
.
StaffAssess
{}
for
_
,
v
:=
range
assessList
{
//假设为删除
v
.
DeletedAt
=
&
nowTime
key
:=
fmt
.
Sprintf
(
"%s%d"
,
string
(
v
.
Types
),
v
.
Executor
.
UserId
)
assessMap
[
key
]
=
v
}
newAssessList
:=
[]
*
domain
.
StaffAssess
{}
//邀请同上级的员工
for
_
,
v
:=
range
inviteSameSuper
{
key
:=
fmt
.
Sprintf
(
"%s%d"
,
string
(
domain
.
AssessInviteSameSuper
),
v
.
UserId
)
if
_
,
ok
:=
assessMap
[
key
];
ok
{
assessMap
[
key
]
.
DeletedAt
=
nil
}
else
{
newAssessList
=
append
(
newAssessList
,
&
domain
.
StaffAssess
{
Id
:
0
,
CompanyId
:
assessTaskData
.
CompanyId
,
EvaluationProjectId
:
assessTaskData
.
EvaluationProjectId
,
EvaluationProjectName
:
assessTaskData
.
EvaluationProjectName
,
CycleId
:
assessTaskData
.
CycleId
,
CycleName
:
assessTaskData
.
CycleName
,
StaffAssessTaskId
:
assessTaskData
.
Id
,
TargetUser
:
domain
.
StaffDesc
{
UserId
:
int
(
targetUser
.
Id
),
Account
:
targetUser
.
Account
,
UserName
:
targetUser
.
Name
,
},
TargetDepartment
:
targetUserDepartment
,
Executor
:
v
,
Types
:
domain
.
AssessInviteSameSuper
,
LinkNodeId
:
inviteNode
.
LinkNodeId
,
LinkNodeName
:
inviteNode
.
LinkNodeName
,
Status
:
domain
.
StaffAssessUncompleted
,
BeginTime
:
inviteNode
.
BeginTime
,
EndTime
:
inviteNode
.
EndTime
,
CreatedAt
:
nowTime
,
UpdatedAt
:
nowTime
,
DeletedAt
:
nil
,
})
}
}
for
_
,
v
:=
range
inviteDiffSuper
{
key
:=
fmt
.
Sprintf
(
"%s%d"
,
string
(
domain
.
AssessInviteDiffSuper
),
v
.
UserId
)
if
_
,
ok
:=
assessMap
[
key
];
ok
{
assessMap
[
key
]
.
DeletedAt
=
nil
}
else
{
newAssessList
=
append
(
newAssessList
,
&
domain
.
StaffAssess
{
Id
:
0
,
CompanyId
:
assessTaskData
.
CompanyId
,
EvaluationProjectId
:
assessTaskData
.
EvaluationProjectId
,
EvaluationProjectName
:
assessTaskData
.
EvaluationProjectName
,
CycleId
:
assessTaskData
.
CycleId
,
CycleName
:
assessTaskData
.
CycleName
,
StaffAssessTaskId
:
assessTaskData
.
Id
,
TargetUser
:
domain
.
StaffDesc
{
UserId
:
int
(
targetUser
.
Id
),
Account
:
targetUser
.
Account
,
UserName
:
targetUser
.
Name
,
},
TargetDepartment
:
targetUserDepartment
,
Executor
:
v
,
Types
:
domain
.
AssessInviteDiffSuper
,
LinkNodeId
:
inviteNode
.
LinkNodeId
,
LinkNodeName
:
inviteNode
.
LinkNodeName
,
Status
:
domain
.
StaffAssessUncompleted
,
BeginTime
:
inviteNode
.
BeginTime
,
EndTime
:
inviteNode
.
EndTime
,
CreatedAt
:
nowTime
,
UpdatedAt
:
nowTime
,
DeletedAt
:
nil
,
})
}
}
assessList
=
append
(
assessList
,
newAssessList
...
)
for
i
:=
range
assessList
{
_
,
err
=
assessReps
.
Save
(
assessList
[
i
])
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"保存员工邀请评估"
+
err
.
Error
())
}
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
result
:=
adapter
.
AssessInviteUserResp
{
AssessTaskId
:
assessTaskData
.
Id
,
}
// for _, v := range assessTaskData.StepList {
// if v.LinkNodeType != domain.LinkNodeAllInvite {
// continue
// }
// result.LinkNodeId = v.LinkNodeId
// result.LinkNodeName = v.LinkNodeName
// result.BeginTime = v.BeginTime.Local().Format("2006-01-02 15:04:05")
// result.EndTime = v.EndTime.Local().Format("2006-01-02 15:04:05")
// break
// }
// for _, v := range assessList {
// if v.Types == domain.AssessInviteDiffSuper {
// result.InviteDiffSuper = append(result.InviteDiffSuper, v.Executor)
// }
// if v.Types == domain.AssessInviteSameSuper {
// result.InviteSameSuper = append(result.InviteDiffSuper, v.Executor)
// }
// }
return
&
result
,
nil
result
:=
map
[
string
]
interface
{}{
"assessTaskId"
:
assessTaskData
.
Id
,
}
return
result
,
nil
}
// 获取员工自评的评估内容详情
func
(
srv
StaffAssessServeice
)
GetAssessSelfInfo
(
param
*
query
.
AssessInfoQuery
)
(
*
adapter
.
AssessInfoResp
,
error
)
{
func
(
srv
StaffAssessServeice
)
GetAssessSelfInfo
(
param
*
query
.
Assess
Self
InfoQuery
)
(
*
adapter
.
AssessInfoResp
,
error
)
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
...
...
@@ -770,7 +843,6 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessInfoQuery) (
assessReps
:=
factory
.
CreateStaffAssessRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
//获取员工的评估
_
,
assessList
,
err
:=
assessReps
.
Find
(
map
[
string
]
interface
{}{
"companyId"
:
param
.
CompanyId
,
...
...
@@ -785,43 +857,369 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessInfoQuery) (
return
&
adapter
.
AssessInfoResp
{},
nil
}
assessData
:=
assessList
[
0
]
assessContentList
:=
[]
*
domain
.
StaffAssessContent
{}
if
assessData
.
Status
==
domain
.
StaffAssessCompleted
{
//已完成
assessContentRepo
:=
factory
.
CreateStaffAssessContentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
_
,
assessContentList
,
err
=
assessContentRepo
.
Find
(
map
[
string
]
interface
{}{
"staffAssessId"
:
assessData
.
Id
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目填写内容"
+
err
.
Error
())
}
}
else
if
assessData
.
Status
==
domain
.
StaffAssessUncompleted
{
//未完成
assessContentList
,
err
=
srv
.
getAssessSelfInfoUncompleted
(
transactionContext
,
assessData
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目填写内容"
+
err
.
Error
())
}
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
result
:=
adapter
.
AssessInfoResp
{
AssessId
:
assessData
.
Id
,
CycleId
:
assessData
.
CycleId
,
CycleName
:
assessData
.
CycleName
,
EvaluationProjectId
:
assessData
.
EvaluationProjectId
,
EvaluationProjectName
:
assessData
.
EvaluationProjectName
,
BeginTime
:
assessData
.
BeginTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
EndTime
:
assessData
.
EndTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
Status
:
string
(
assessData
.
Status
),
TargetUserId
:
assessData
.
TargetUser
.
UserId
,
TargetUserName
:
assessData
.
TargetUser
.
UserName
,
AssessContent
:
assessContentList
,
}
return
&
result
,
nil
}
// 获取未完成的员工评估内容
func
(
srv
StaffAssessServeice
)
getAssessSelfInfoUncompleted
(
transactionContext
application
.
TransactionContext
,
assess
*
domain
.
StaffAssess
)
([]
*
domain
.
StaffAssessContent
,
error
)
{
projectRepo
:=
factory
.
CreateEvaluationProjectRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
projectData
,
err
:=
projectRepo
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
assess
Data
.
EvaluationProjectId
,
"id"
:
assess
.
EvaluationProjectId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目
评估配置
"
+
err
.
Error
())
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目
填写内容
"
+
err
.
Error
())
}
if
projectData
.
Template
==
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"未获取到项目评估配置模板"
)
}
var
selfLinkNode
*
domain
.
LinkNode
var
linkNode
*
domain
.
LinkNode
for
_
,
v
:=
range
projectData
.
Template
.
LinkNodes
{
if
v
.
Type
==
domain
.
LinkNodeSelfAssessment
{
selfLinkNode
=
v
if
v
.
Id
==
int64
(
assess
.
LinkNodeId
)
{
linkNode
=
v
break
}
}
if
selfLinkNode
==
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"未获取到项目评估自评配置"
)
if
linkNode
==
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"未获得评估环节配置"
+
err
.
Error
())
}
ruleRepo
:=
factory
.
CreateEvaluationRuleRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
ruleMap
:=
map
[
int64
]
*
domain
.
EvaluationRule
{}
for
_
,
v
:=
range
linkNode
.
NodeContents
{
if
_
,
ok
:=
ruleMap
[
v
.
RuleId
];
ok
{
continue
}
ruleData
,
err
:=
ruleRepo
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
v
.
RuleId
,
})
if
err
==
nil
{
ruleMap
[
v
.
RuleId
]
=
ruleData
}
}
var
contentList
[]
*
domain
.
StaffAssessContent
nowTime
:=
time
.
Now
()
for
i
,
v
:=
range
linkNode
.
NodeContents
{
item
:=
&
domain
.
StaffAssessContent
{
Id
:
0
,
StaffAssessId
:
assess
.
Id
,
SortBy
:
i
+
1
,
Category
:
v
.
Category
,
Name
:
v
.
Name
,
PromptTitle
:
v
.
PromptTitle
,
PromptText
:
v
.
PromptText
,
Remark
:
nil
,
Value
:
""
,
ReteResult
:
""
,
CreatedAt
:
nowTime
,
UpdatedAt
:
nowTime
,
DeletedAt
:
nil
,
// Rule: ,
}
if
ruleVal
,
ok
:=
ruleMap
[
v
.
RuleId
];
ok
{
item
.
Rule
=
*
ruleVal
}
var
remarks
[]
domain
.
AssessContemtRemark
for
_
,
vv
:=
range
v
.
EntryItems
{
ritem
:=
domain
.
AssessContemtRemark
{
Title
:
vv
.
Title
,
HintText
:
vv
.
HintText
,
RemarkText
:
""
,
}
remarks
=
append
(
remarks
,
ritem
)
}
item
.
Remark
=
remarks
contentList
=
append
(
contentList
,
item
)
}
return
contentList
,
nil
}
// 选择员工评估可邀请的用户
func
(
srv
StaffAssessServeice
)
SelectAssessInviteUser
(
param
*
query
.
SelectAssessInviteUser
)
(
map
[
string
]
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
//获取被评估的目标用户
userRepo
:=
factory
.
CreateUserRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
targetUser
,
err
:=
userRepo
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
param
.
TargetUserId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取员工信息"
+
err
.
Error
())
}
//获取被评估的目标用户的部门
departmentRepo
:=
factory
.
CreateDepartmentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
_
,
targetUserDepartment
,
err
:=
departmentRepo
.
Find
(
map
[
string
]
interface
{}{
"ids"
:
targetUser
.
DepartmentId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取部门信息"
+
err
.
Error
())
}
//获取部门主管的id
targetUserCharge
:=
map
[
int64
]
struct
{}{}
for
_
,
v
:=
range
targetUserDepartment
{
for
_
,
vv
:=
range
v
.
ChargeUserIds
{
targetUserCharge
[
vv
]
=
struct
{}{}
}
}
//
targetUserDepartmentMap
:=
map
[
int64
]
struct
{}{}
for
_
,
v
:=
range
targetUserDepartment
{
targetUserDepartmentMap
[
v
.
Id
]
=
struct
{}{}
}
//查询员工数据
condition
:=
map
[
string
]
interface
{}{
"companyId"
:
param
.
CompanyId
,
"name"
:
param
.
InviteUserName
,
"limit"
:
20
,
}
if
param
.
PageSize
>
0
{
condition
[
"limit"
]
=
param
.
PageSize
}
offset
:=
(
param
.
PageNumber
-
1
)
*
param
.
PageSize
if
offset
>
0
{
condition
[
"offset"
]
=
offset
}
cnt
,
userList
,
err
:=
userRepo
.
Find
(
condition
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取员工列表信息"
+
err
.
Error
())
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
listData
:=
[]
adapter
.
SelectInviteUser
{}
for
_
,
v
:=
range
userList
{
item
:=
adapter
.
SelectInviteUser
{
UserId
:
int
(
v
.
Id
),
UserName
:
v
.
Name
,
IsSupper
:
false
,
Types
:
2
,
//默认是不同上级
}
if
_
,
ok
:=
targetUserCharge
[
v
.
Id
];
ok
{
item
.
IsSupper
=
true
}
for
_
,
vv
:=
range
v
.
DepartmentId
{
if
_
,
ok
:=
targetUserDepartmentMap
[
int64
(
vv
)];
ok
{
item
.
Types
=
1
//设为相同上级
break
}
}
listData
=
append
(
listData
,
item
)
}
return
tool_funs
.
SimpleWrapGridMap
(
int64
(
cnt
),
listData
),
nil
}
// 获取我的360评估,用户列表和评估填写的值
func
(
srv
StaffAssessServeice
)
ListInviteUserAssess
(
param
*
query
.
ListInviteUserAssessQuery
)
(
*
adapter
.
ListInviteUserAssessResp
,
error
)
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
//获取对应的评估任务
assessRepo
:=
factory
.
CreateStaffAssessRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
//获取 executorId 对应的360评估任务 用户
cnt
,
assessList
,
err
:=
assessRepo
.
Find
(
map
[
string
]
interface
{}{
"staffAssessTaskId"
:
param
.
AssessTaskkId
,
"executorId"
:
param
.
ExecutorId
,
"typesList"
:
[]
string
{
string
(
domain
.
AssessInviteDiffSuper
),
string
(
domain
.
AssessInviteSameSuper
)},
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
// 获取已经填报的内容
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
//TODO 评估填写数据行转列
tableHeader
:=
[]
adapter
.
ListTableHeader
{
{
Key
:
"userName"
,
Name
:
"姓名"
},
{
Key
:
"status"
,
Name
:
"状态"
},
{
Key
:
"types"
,
Name
:
"360°评估关系"
},
{
Key
:
"endTime"
,
Name
:
"360°评估截止日期"
},
}
listData
:=
[]
map
[
string
]
string
{}
for
_
,
v
:=
range
assessList
{
m
:=
map
[
string
]
string
{
"userName"
:
v
.
TargetUser
.
UserName
,
"status"
:
string
(
v
.
Status
),
"types"
:
string
(
v
.
Types
),
"endTime"
:
v
.
EndTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
}
listData
=
append
(
listData
,
m
)
}
_
=
tableHeader
result
:=
adapter
.
ListInviteUserAssessResp
{
TableHeader
:
tableHeader
,
List
:
listData
,
Total
:
cnt
,
}
return
&
result
,
nil
}
// 获取上级评估成员列表
func
(
srv
StaffAssessServeice
)
ListSupperAssess
(
param
*
query
.
ListSupperAssessQuery
)
(
map
[
string
]
interface
{},
error
)
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
//获取对应的评估任务
assessRepo
:=
factory
.
CreateStaffAssessRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
//获取 executorId 对应的上级评估列表
cnt
,
assessList
,
err
:=
assessRepo
.
Find
(
map
[
string
]
interface
{}{
"staffAssessTaskId"
:
param
.
AssessTaskkId
,
"executorId"
:
param
.
ExecutorId
,
"typesList"
:
[]
string
{
string
(
domain
.
AssessSuper
)},
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
resultList
:=
[]
adapter
.
ListSupperAssessResp
{}
for
_
,
v
:=
range
assessList
{
item
:=
adapter
.
ListSupperAssessResp
{
AssessId
:
v
.
Id
,
UserName
:
v
.
TargetUser
.
UserName
,
EndTime
:
v
.
EndTime
.
Local
()
.
Format
(
"2006-01-02 15:04:05"
),
InviteUncompleted
:
0
,
InviteTotal
:
5
,
Department
:
""
,
Position
:
""
,
DutyTime
:
""
,
}
for
_
,
vv
:=
range
v
.
TargetDepartment
{
item
.
Department
+=
vv
.
DepartmentName
+
" "
}
resultList
=
append
(
resultList
,
item
)
}
return
tool_funs
.
SimpleWrapGridMap
(
int64
(
cnt
),
resultList
),
nil
}
// 根据staffAssessId 获取评估的填写信息
func
(
srv
StaffAssessServeice
)
GetAssessInfo
(
param
*
query
.
AssessInfoQuery
)
(
*
adapter
.
AssessInfoResp
,
error
)
{
transactionContext
,
err
:=
factory
.
CreateTransactionContext
(
nil
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
if
err
:=
transactionContext
.
StartTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
defer
func
()
{
_
=
transactionContext
.
RollbackTransaction
()
}()
assessReps
:=
factory
.
CreateStaffAssessRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
//获取员工的评估
_
,
assessList
,
err
:=
assessReps
.
Find
(
map
[
string
]
interface
{}{
"companyId"
:
param
.
CompanyId
,
"id"
:
param
.
AssessId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取员工的评估"
+
err
.
Error
())
}
if
len
(
assessList
)
==
0
{
return
&
adapter
.
AssessInfoResp
{},
nil
}
assessData
:=
assessList
[
0
]
assessContentList
:=
[]
*
domain
.
StaffAssessContent
{}
if
assessData
.
Status
==
domain
.
StaffAssessCompleted
{
//已完成
assessContentRepo
:=
factory
.
CreateStaffAssessContentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
_
,
assessContentList
,
err
=
assessContentRepo
.
Find
(
map
[
string
]
interface
{}{
"staffAssessId"
:
assessData
.
Id
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目填写内容"
+
err
.
Error
())
}
}
else
if
assessData
.
Status
==
domain
.
StaffAssessUncompleted
{
//未完成
assessContentList
,
err
=
srv
.
getAssessSelfInfoUncompleted
(
transactionContext
,
assessData
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取项目填写内容"
+
err
.
Error
())
}
}
//获取员工评估的填写内容
// assessContentReps := factory.CreateStaffAssessContentRepository(map[string]interface{}{
// "transactionContext": transactionContext,
// })
// _, assessContentList, err := assessContentReps.Find(map[string]interface{}{
// "staffAssessId": assessData.Id,
// })
// if err != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取项目评估员工填写的内容"+err.Error())
// }
if
err
:=
transactionContext
.
CommitTransaction
();
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
result
:=
adapter
.
AssessInfoResp
{
AssessId
:
assessData
.
Id
,
CycleId
:
assessData
.
CycleId
,
CycleName
:
assessData
.
CycleName
,
EvaluationProjectId
:
assessData
.
EvaluationProjectId
,
...
...
@@ -831,18 +1229,13 @@ func (srv StaffAssessServeice) GetAssessSelfInfo(param *query.AssessInfoQuery) (
Status
:
string
(
assessData
.
Status
),
TargetUserId
:
assessData
.
TargetUser
.
UserId
,
TargetUserName
:
assessData
.
TargetUser
.
UserName
,
AssessContent
:
nil
,
}
assessContent
:=
make
([]
adapter
.
AssessContent
,
0
)
for
_
,
v
:=
range
selfLinkNode
.
NodeContents
{
assessContent
=
append
(
assessContent
,
adapter
.
AssessContent
{
Category
:
v
.
Category
,
Name
:
v
.
Name
,
PromptTitle
:
v
.
PromptTitle
,
PromptText
:
v
.
PromptText
,
EntryItems
:
v
.
EntryItems
,
})
AssessContent
:
assessContentList
,
}
result
.
AssessContent
=
assessContent
return
&
result
,
nil
}
// 获取员工的某次评估任务的360评估记录录
// assessTaskId targetUserId
func
(
srv
StaffAssessServeice
)
AssessInviteList
()
error
{
return
nil
}
...
...
pkg/domain/evaluation_cycle.go
查看文件 @
b92074a
...
...
@@ -17,7 +17,7 @@ const (
type
TemplateSimple
struct
{
Id
int64
`json:"id,string" comment:"模板ID"`
Name
string
`json:"name" comment:"模板名称"`
CreatedAt
time
.
Time
`json:"createdAt" comment:"创建时间"`
CreatedAt
time
.
Time
`json:"createdAt" comment:"
模板
创建时间"`
}
type
EvaluationCycle
struct
{
...
...
pkg/domain/evaluation_cycle_template.go
查看文件 @
b92074a
...
...
@@ -5,13 +5,14 @@ import (
)
type
EvaluationCycleTemplate
struct
{
Id
int64
`json:"id,string" comment:"模板ID"`
Name
string
`json:"name" comment:"模板名称"`
Template
*
EvaluationTemplate
`json:"template" comment:"模板数据"`
CycleId
int64
`json:"cycleId,string" comment:"周期ID"`
CreatedAt
time
.
Time
`json:"createdAt" comment:"创建时间"`
UpdatedAt
time
.
Time
`json:"updatedAt" comment:"更新时间"`
DeletedAt
*
time
.
Time
`json:"deletedAt" comment:"删除时间"`
Id
int64
`json:"id,string" comment:"模板ID"`
Name
string
`json:"name" comment:"模板名称"`
TemplateCreatedAt
time
.
Time
`json:"templateCreatedAt" comment:"模板创建时间"`
Template
*
EvaluationTemplate
`json:"template" comment:"模板数据"`
CycleId
int64
`json:"cycleId,string" comment:"周期ID"`
CreatedAt
time
.
Time
`json:"createdAt" comment:"创建时间"`
UpdatedAt
time
.
Time
`json:"updatedAt" comment:"更新时间"`
DeletedAt
*
time
.
Time
`json:"deletedAt" comment:"删除时间"`
}
type
EvaluationCycleTemplateRepository
interface
{
...
...
pkg/domain/evaluation_template.go
查看文件 @
b92074a
...
...
@@ -33,7 +33,7 @@ type EntryItem struct {
type
NodeContent
struct
{
Category
string
`json:"category" comment:"类别"`
Name
string
`json:"name" comment:"名称"`
RuleId
int64
`json:"ruleId" comment:"评估规则ID"`
RuleId
int64
`json:"ruleId
,string
" comment:"评估规则ID"`
Rule
*
EvaluationRule
`json:"rule" comment:"评估规则对象"`
PromptTitle
string
`json:"promptTitle" comment:"提示项标题"`
PromptText
string
`json:"promptText" comment:"提示项正文"`
...
...
@@ -59,7 +59,7 @@ type LinkNode struct {
NodeContents
[]
*
NodeContent
`json:"nodeContents" comment:"环节-评估内容"`
TimeStart
*
time
.
Time
`json:"timeStart" comment:"起始时间"`
TimeEnd
*
time
.
Time
`json:"timeEnd" comment:"截至时间"`
KpiCycle
int
`json:"
stat
e" comment:"考核周期(1日、2周、3月)"`
KpiCycle
int
`json:"
kpiCycl
e" comment:"考核周期(1日、2周、3月)"`
//NodeAllInvite *NodeAllInvite `json:"nodeAllInvite" comment:"360°邀请人员"`
}
...
...
pkg/domain/role.go
查看文件 @
b92074a
...
...
@@ -10,7 +10,7 @@ const (
type
Role
struct
{
Id
int64
`json:"id,string"`
Name
string
`json:"name"`
Type
int
`json:"type"`
Type
int
`json:"type"
pg:",use_zero"
`
Description
string
`json:"description"`
CompanyId
int64
`json:"companyId,string"`
CreatedAt
time
.
Time
`json:"createdAt"`
...
...
pkg/domain/staff_assess_content.go
查看文件 @
b92074a
...
...
@@ -4,22 +4,26 @@ import "time"
//填写的评估内容
type
StaffAssessContent
struct
{
Id
int
`json:"id"`
//id
StaffAssessId
int
`json:"staffAssessId"`
//用户需要的评估项id
SortBy
int
`json:"sortBy"`
//排序
Category
string
`json:"category"`
//类别
Title
string
`json:"title"`
//问题标题
Remark
string
`json:"remark"`
//填写的反馈
Rate
string
`json:"rate"`
//评估填写的值
ReteResult
string
`json:"reteResult"`
//评估的结果
CreatedAt
time
.
Time
`json:"createdAt"`
//数据创建时间
UpdatedAt
time
.
Time
`json:"updatedAt"`
//数据更新时间
//TODO
Id
int
`json:"id"`
//id
StaffAssessId
int
`json:"staffAssessId"`
//用户需要的评估项id
SortBy
int
`json:"sortBy"`
//排序
Category
string
`json:"category"`
//类别
Name
string
`json:"name"`
//名称
PromptTitle
string
`json:"promptTitle"`
//提示项标题
PromptText
string
`json:"promptText"`
//提示项正文
Remark
[]
AssessContemtRemark
`json:"remark"`
//填写的反馈
Value
string
`json:"value"`
//评估填写的值
ReteResult
string
`json:"reteResult"`
//评估的结果
Rule
EvaluationRule
`json:"rule"`
//评估的选项规则
CreatedAt
time
.
Time
`json:"createdAt"`
//数据创建时间
UpdatedAt
time
.
Time
`json:"updatedAt"`
//数据更新时间
DeletedAt
*
time
.
Time
`json:"deletedAt"`
}
type
AssessContemtRemark
struct
{
Title
string
`json:"title"`
//comment:"填写标题"
RemarkText
string
`json:"hintText"`
// comment:"填写文本内容"
Title
string
`json:"title"`
//comment:"填写标题"
HintText
string
`json:"hintText"`
// comment:"文本内容提示"
RemarkText
string
`json:"remarkText"`
// comment:"填写文本内容"
}
type
StaffAssessContentRepository
interface
{
...
...
pkg/domain/user.go
查看文件 @
b92074a
...
...
@@ -3,19 +3,20 @@ package domain
import
"time"
type
User
struct
{
Id
int64
// 用户Id
Account
string
// 用户账号
AvatarUrl
string
// 用户头像URL
CompanyId
int64
// 公司编号
AdminType
int
// 1普通员工 2 主管理员
Name
string
// 用户姓名
Email
string
// 邮箱
Status
int
// 用户状态(1正常 2禁用)
DepartmentId
[]
int
// 用户归属的部门
PositionId
[]
int
//用户职位
UpdatedAt
time
.
Time
// 更新时间
DeletedAt
*
time
.
Time
CreatedAt
time
.
Time
Id
int64
`json:"id"`
// 用户Id
Account
string
`json:"account"`
// 用户账号
AvatarUrl
string
`json:"avatarUrl"`
// 用户头像URL
CompanyId
int64
`json:"companyId"`
// 公司编号
AdminType
int
`json:"adminType"`
// 1普通员工 2 主管理员
Name
string
`json:"name"`
// 用户姓名
Email
string
`json:"email"`
// 邮箱
Status
int
`json:"status"`
// 用户状态(1正常 2禁用)
DepartmentId
[]
int
`json:"departmentId"`
// 用户归属的部门
PositionId
[]
int
`json:"PositionId"`
//用户职位
EntryTime
string
`json:"entryTime"`
//入职日期
UpdatedAt
time
.
Time
`json:"updatedAt"`
// 更新时间
DeletedAt
*
time
.
Time
`json:"deletedAt"`
CreatedAt
time
.
Time
`json:"createdAt"`
}
// 1普通员工 2 主管理员
...
...
pkg/infrastructure/pg/init.go
查看文件 @
b92074a
...
...
@@ -42,6 +42,7 @@ func init() {
&
models
.
EvaluationProject
{},
&
models
.
StaffAssess
{},
&
models
.
StaffAssessTask
{},
&
models
.
StaffAssessContent
{},
}
for
_
,
model
:=
range
tables
{
err
:=
DB
.
Model
(
model
)
.
CreateTable
(
&
orm
.
CreateTableOptions
{
...
...
pkg/infrastructure/pg/models/evaluation_cycle_template.go
查看文件 @
b92074a
...
...
@@ -6,12 +6,13 @@ import (
)
type
EvaluationCycleTemplate
struct
{
tableName
struct
{}
`comment:"评估周期模板" pg:"evaluation_cycle_template"`
Id
int64
`comment:"模板ID" pg:"pk:id"`
Name
string
`comment:"模板名称"`
Template
*
domain
.
EvaluationTemplate
`comment:"模板数据"`
CycleId
int64
`comment:"周期ID"`
CreatedAt
time
.
Time
`comment:"创建时间"`
UpdatedAt
time
.
Time
`comment:"更新时间"`
DeletedAt
*
time
.
Time
`comment:"删除时间"`
tableName
struct
{}
`comment:"评估周期模板" pg:"evaluation_cycle_template"`
Id
int64
`comment:"模板ID" pg:"pk:id"`
Name
string
`comment:"模板名称"`
TemplateCreatedAt
time
.
Time
`comment:"模板创建时间"`
Template
*
domain
.
EvaluationTemplate
`comment:"模板数据"`
CycleId
int64
`comment:"周期ID"`
CreatedAt
time
.
Time
`comment:"创建时间"`
UpdatedAt
time
.
Time
`comment:"更新时间"`
DeletedAt
*
time
.
Time
`comment:"删除时间"`
}
...
...
pkg/infrastructure/pg/models/evaluation_rule.go
查看文件 @
b92074a
...
...
@@ -17,5 +17,5 @@ type EvaluationRule struct {
Score
domain
.
Score
`comment:"评分"`
CreatedAt
time
.
Time
`comment:"创建时间"`
UpdatedAt
time
.
Time
`comment:"更新时间"`
DeletedAt
*
time
.
Time
`comment:"删除时间"
pg:",soft_delete"
`
DeletedAt
*
time
.
Time
`comment:"删除时间"`
}
...
...
pkg/infrastructure/pg/models/role.go
查看文件 @
b92074a
...
...
@@ -3,13 +3,13 @@ package models
import
"time"
type
Role
struct
{
tableName
struct
{}
`pg:"role" comment:"角色"`
Id
int64
`pg:"pk:id" comment:"ID"`
tableName
struct
{}
`comment:"角色" pg:"role"`
Id
int64
`comment:"ID" pg:"pk:id"`
Name
string
`comment:"角色名称"`
Type
int
`comment:"角色类型(0角色可删、1系统预置角色不可删)" pg:",use_zero"`
Description
string
`comment:"角色描述"`
CompanyId
int64
`comment:"公司ID"`
CreatedAt
time
.
Time
`comment:"创建时间"`
UpdatedAt
time
.
Time
`comment:"更新时间"`
DeletedAt
*
time
.
Time
`comment:"删除时间"
pg:",soft_delete"
`
DeletedAt
*
time
.
Time
`comment:"删除时间"`
}
...
...
pkg/infrastructure/pg/models/role_user.go
查看文件 @
b92074a
...
...
@@ -10,5 +10,5 @@ type RoleUser struct {
CompanyId
int64
`comment:"公司ID"`
CreatedAt
time
.
Time
`comment:"创建时间"`
UpdatedAt
time
.
Time
`comment:"更新时间"`
DeletedAt
*
time
.
Time
`comment:"删除时间"
pg:",soft_delete"
`
DeletedAt
*
time
.
Time
`comment:"删除时间"`
}
...
...
pkg/infrastructure/pg/models/staff_assess_content.go
查看文件 @
b92074a
package
models
import
"time"
import
(
"time"
//填写的评估内容
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
)
// 填写的评估内容
type
StaffAssessContent
struct
{
tableName
struct
{}
`pg:"staff_assess_content" comment:"填写的评估项"`
Id
int
`pg:",pk"`
//id
StaffAssessId
int
//用户需要的评估项id
SortBy
int
//排序
Category
string
//类别
Title
string
//问题标题
Remark
string
//填写的反馈
Rate
string
//评估填写的值
ReteResult
string
//评估的结果
tableName
struct
{}
`pg:"staff_assess_content" comment:"填写的评估项"`
Id
int
`pg:",pk"`
//id
StaffAssessId
int
//用户需要的评估项id
SortBy
int
//排序
Category
string
//类别
Name
string
//名称
PromptTitle
string
//问题标题
PromptText
string
//提示项正文
Value
string
//评估填写的值
ReteResult
string
//评估的结果
Rule
domain
.
EvaluationRule
Remark
[]
domain
.
AssessContemtRemark
CreatedAt
time
.
Time
//数据创建时间
UpdatedAt
time
.
Time
//数据更新时间
DeletedAt
*
time
.
Time
}
type
StaffAssessContentRepository
interface
{
...
...
pkg/infrastructure/pg/models/user.go
查看文件 @
b92074a
...
...
@@ -14,6 +14,7 @@ type User struct {
Status
int
// 用户状态(1正常 2禁用)
DepartmentId
[]
int
// 用户归属的部门
PositionId
[]
int
// 用户职位
EntryTime
string
//入职日期
CreatedAt
time
.
Time
// 创建时间
UpdatedAt
time
.
Time
// 更新时间
DeletedAt
*
time
.
Time
`pg:",soft_delete"`
// 删除时间
...
...
pkg/infrastructure/repository/pg_evaluation_cycle_template_repository.go
查看文件 @
b92074a
...
...
@@ -22,25 +22,27 @@ func NewEvaluationCycleTemplateRepository(transactionContext *pgTransaction.Tran
func
(
repo
*
EvaluationCycleTemplateRepository
)
TransformToDomain
(
m
*
models
.
EvaluationCycleTemplate
)
domain
.
EvaluationCycleTemplate
{
return
domain
.
EvaluationCycleTemplate
{
Id
:
m
.
Id
,
Name
:
m
.
Name
,
Template
:
m
.
Template
,
CycleId
:
m
.
CycleId
,
CreatedAt
:
m
.
CreatedAt
,
UpdatedAt
:
m
.
UpdatedAt
,
DeletedAt
:
m
.
DeletedAt
,
Id
:
m
.
Id
,
Name
:
m
.
Name
,
TemplateCreatedAt
:
m
.
TemplateCreatedAt
,
Template
:
m
.
Template
,
CycleId
:
m
.
CycleId
,
CreatedAt
:
m
.
CreatedAt
,
UpdatedAt
:
m
.
UpdatedAt
,
DeletedAt
:
m
.
DeletedAt
,
}
}
func
(
repo
*
EvaluationCycleTemplateRepository
)
TransformToModel
(
d
*
domain
.
EvaluationCycleTemplate
)
models
.
EvaluationCycleTemplate
{
return
models
.
EvaluationCycleTemplate
{
Id
:
d
.
Id
,
Name
:
d
.
Name
,
Template
:
d
.
Template
,
CycleId
:
d
.
CycleId
,
CreatedAt
:
d
.
CreatedAt
,
UpdatedAt
:
d
.
UpdatedAt
,
DeletedAt
:
d
.
DeletedAt
,
Id
:
d
.
Id
,
Name
:
d
.
Name
,
TemplateCreatedAt
:
d
.
TemplateCreatedAt
,
Template
:
d
.
Template
,
CycleId
:
d
.
CycleId
,
CreatedAt
:
d
.
CreatedAt
,
UpdatedAt
:
d
.
UpdatedAt
,
DeletedAt
:
d
.
DeletedAt
,
}
}
...
...
pkg/infrastructure/repository/pg_evaluation_template_repository.go
查看文件 @
b92074a
...
...
@@ -142,7 +142,12 @@ func (repo *EvaluationTemplateRepository) Find(queryOptions map[string]interface
}
if
v
,
ok
:=
queryOptions
[
"createdAt"
];
ok
{
query
.
Where
(
"created_at = ?"
,
v
)
t
:=
v
.
(
*
time
.
Time
)
year
,
month
,
day
:=
t
.
Date
()
begin
:=
time
.
Date
(
year
,
month
,
day
,
0
,
0
,
0
,
0
,
time
.
Local
)
end
:=
time
.
Date
(
year
,
month
,
day
,
23
,
59
,
59
,
0
,
time
.
Local
)
query
.
Where
(
"created_at >= ?"
,
begin
)
query
.
Where
(
"created_at <= ?"
,
end
)
}
if
v
,
ok
:=
queryOptions
[
"limit"
]
.
(
int
);
ok
{
...
...
pkg/infrastructure/repository/pg_role_user_repository.go
查看文件 @
b92074a
...
...
@@ -125,7 +125,7 @@ func (repo *RoleUserRepository) Find(queryOptions map[string]interface{}) (int64
}
if
userIds
,
ok
:=
queryOptions
[
"userIds"
];
ok
{
query
.
Where
(
"user_id in (?)"
,
userIds
)
query
.
Where
(
"user_id in (?)"
,
pg
.
In
(
userIds
)
)
}
if
v
,
ok
:=
queryOptions
[
"limit"
]
.
(
int
);
ok
{
...
...
@@ -182,7 +182,7 @@ func (repo *RoleUserRepository) BatchDeleteById(ids []int64) error {
return
err
}
func
(
repo
*
RoleUserRepository
)
FindAllContainUser
(
page
Size
int
,
pageNumber
int
,
companyId
int64
,
roleId
int64
)
([]
*
domain
.
RoleContainUser
,
error
)
{
func
(
repo
*
RoleUserRepository
)
FindAllContainUser
(
page
Number
int
,
pageSize
int
,
companyId
int64
,
roleId
int64
)
([]
*
domain
.
RoleContainUser
,
error
)
{
limit
:=
pageSize
offset
:=
limit
*
(
pageNumber
-
1
)
if
offset
<
0
{
...
...
@@ -192,7 +192,7 @@ func (repo *RoleUserRepository) FindAllContainUser(pageSize int, pageNumber int,
"role_user".role_id,
"role_user".user_id,
"user".name as user_name,
"user".email as user_email
,
"user".email as user_email
`
whereFrom
:=
`
FROM "role_user"
...
...
pkg/infrastructure/repository/pg_staff_assess_content_repository.go
查看文件 @
b92074a
...
...
@@ -22,12 +22,40 @@ func NewStaffAssessContentRepository(transactionContext *pgTransaction.Transacti
}
func
(
repo
*
StaffAssessContentRepository
)
TransformToDomain
(
d
*
models
.
StaffAssessContent
)
*
domain
.
StaffAssessContent
{
return
&
domain
.
StaffAssessContent
{}
return
&
domain
.
StaffAssessContent
{
Id
:
d
.
Id
,
StaffAssessId
:
d
.
StaffAssessId
,
SortBy
:
d
.
SortBy
,
Category
:
d
.
Category
,
Name
:
d
.
Name
,
PromptTitle
:
d
.
PromptTitle
,
PromptText
:
d
.
PromptText
,
Remark
:
d
.
Remark
,
Value
:
d
.
Value
,
ReteResult
:
d
.
ReteResult
,
Rule
:
d
.
Rule
,
CreatedAt
:
d
.
CreatedAt
,
UpdatedAt
:
d
.
UpdatedAt
,
DeletedAt
:
nil
,
}
}
func
(
repo
*
StaffAssessContentRepository
)
Save
(
d
*
domain
.
StaffAssessContent
)
(
*
domain
.
StaffAssessContent
,
error
)
{
saveModel
:=
models
.
StaffAssess
{
Id
:
d
.
Id
,
saveModel
:=
models
.
StaffAssessContent
{
Id
:
d
.
Id
,
StaffAssessId
:
d
.
StaffAssessId
,
SortBy
:
d
.
SortBy
,
Category
:
d
.
Category
,
Name
:
d
.
Name
,
PromptTitle
:
d
.
PromptTitle
,
PromptText
:
d
.
PromptText
,
Remark
:
d
.
Remark
,
Value
:
d
.
Value
,
ReteResult
:
d
.
ReteResult
,
Rule
:
d
.
Rule
,
CreatedAt
:
d
.
CreatedAt
,
UpdatedAt
:
d
.
UpdatedAt
,
DeletedAt
:
nil
,
}
tx
:=
repo
.
transactionContext
.
PgTx
var
err
error
...
...
@@ -79,7 +107,7 @@ func (repo *StaffAssessContentRepository) Find(queryOptions map[string]interface
tx
:=
repo
.
transactionContext
.
PgTx
var
m
[]
*
models
.
StaffAssessContent
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
)
}
...
...
pkg/infrastructure/repository/pg_staff_assess_repository.go
查看文件 @
b92074a
...
...
@@ -140,7 +140,9 @@ func (repo *StaffAssessRepository) Find(queryOptions map[string]interface{}) (in
if
v
,
ok
:=
queryOptions
[
"staffAssessTaskId"
];
ok
{
query
.
Where
(
`staff_assess_task_id=?`
,
v
)
}
if
v
,
ok
:=
queryOptions
[
"id"
];
ok
{
query
.
Where
(
"id=?"
,
v
)
}
if
v
,
ok
:=
queryOptions
[
"typesList"
]
.
([]
string
);
ok
&&
len
(
v
)
>
0
{
query
.
Where
(
"types in(?)"
,
pg
.
In
(
v
))
}
...
...
pkg/infrastructure/repository/pg_user_repository.go
查看文件 @
b92074a
package
repository
import
(
"fmt"
"github.com/go-pg/pg/v10"
pgTransaction
"github.com/linmadan/egglib-go/transaction/pg"
"gitlab.fjmaimaimai.com/allied-creation/performance/pkg/domain"
...
...
@@ -114,8 +116,8 @@ func (repo *UserRepository) Find(queryOptions map[string]interface{}) (int, []*d
if
v
,
ok
:=
queryOptions
[
"account"
];
ok
{
query
.
Where
(
"account like ?"
,
v
)
}
if
v
,
ok
:=
queryOptions
[
"name"
];
ok
&&
v
.
(
string
)
!=
""
{
query
.
Where
(
"name like ?"
,
"%"
+
v
.
(
string
)
+
"%"
)
if
v
,
ok
:=
queryOptions
[
"name"
];
ok
{
query
.
Where
(
"name like ?"
,
fmt
.
Sprintf
(
"%%%v%%"
,
v
))
}
if
v
,
ok
:=
queryOptions
[
"offset"
];
ok
{
query
.
Offset
(
v
.
(
int
))
...
...
pkg/port/beego/controllers/evaluation_cycle_controller.go
查看文件 @
b92074a
...
...
@@ -87,3 +87,23 @@ func (controller *CycleController) StatisticCycleUser() {
controller
.
Response
(
ruService
.
StatisticCycleUser
(
in
))
}
}
func
(
controller
*
CycleController
)
CycleTemplateList
()
{
ruService
:=
service
.
NewEvaluationCycleService
()
in
:=
&
command
.
CycleTemplateListCommand
{}
if
err
:=
controller
.
Unmarshal
(
in
);
err
!=
nil
{
controller
.
Response
(
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
err
.
Error
()))
}
else
{
controller
.
Response
(
ruService
.
CycleTemplateList
(
in
))
}
}
func
(
controller
*
CycleController
)
CycleTemplate
()
{
ruService
:=
service
.
NewEvaluationCycleService
()
in
:=
&
command
.
CycleTemplateCommand
{}
if
err
:=
controller
.
Unmarshal
(
in
);
err
!=
nil
{
controller
.
Response
(
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
err
.
Error
()))
}
else
{
controller
.
Response
(
ruService
.
CycleTemplate
(
in
))
}
}
...
...
pkg/port/beego/controllers/evaluation_rule_controller.go
查看文件 @
b92074a
...
...
@@ -21,8 +21,6 @@ func (controller *RuleController) CreateRule() {
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
in
.
CreatorId
=
ua
.
UserId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
//in.CreatorId = middlewares.GetUserId(controller.Ctx)
controller
.
Response
(
ruService
.
Create
(
in
))
}
}
...
...
@@ -35,9 +33,6 @@ func (controller *RuleController) UpdateRule() {
}
else
{
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
in
.
CreatorId
=
ua
.
UserId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
//in.CreatorId = middlewares.GetUserId(controller.Ctx)
controller
.
Response
(
ruService
.
Update
(
in
))
}
}
...
...
pkg/port/beego/controllers/evaluation_template_controller.go
查看文件 @
b92074a
...
...
@@ -22,8 +22,6 @@ func (controller *TemplateController) CreateTemplate() {
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
in
.
CreatorId
=
ua
.
UserId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
//in.CreatorId = middlewares.GetUserId(controller.Ctx)
controller
.
Response
(
ruService
.
Create
(
in
))
}
}
...
...
@@ -36,7 +34,6 @@ func (controller *TemplateController) UpdateTemplate() {
}
else
{
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
controller
.
Response
(
ruService
.
Update
(
in
))
}
}
...
...
@@ -74,7 +71,6 @@ func (controller *TemplateController) ListTemplate() {
}
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
controller
.
Response
(
ruService
.
List
(
in
))
}
}
...
...
@@ -90,7 +86,6 @@ func (controller *TemplateController) ListEnableTemplate() {
}
else
{
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
controller
.
Response
(
ruService
.
List
(
in
))
}
}
...
...
@@ -103,7 +98,6 @@ func (controller *TemplateController) StateTemplate() {
}
else
{
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
controller
.
Response
(
ruService
.
State
(
in
))
}
}
...
...
pkg/port/beego/controllers/role_controller.go
查看文件 @
b92074a
...
...
@@ -12,38 +12,38 @@ type RoleController struct {
beego
.
BaseController
}
//func (controller *RoleController) CreateRole() {
// ruService := service.NewRoleService()
// in := &command.CreateRoleCommand{}
// if err := controller.Unmarshal(in); err != nil {
// controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
// } else {
// in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
// controller.Response(ruService.Create(in))
// func (controller *RoleController) CreateRole() {
// ruService := service.NewRoleService()
// in := &command.CreateRoleCommand{}
// if err := controller.Unmarshal(in); err != nil {
// controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
// } else {
// in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
// controller.Response(ruService.Create(in))
// }
// }
//}
//
//func (controller *RoleController) UpdateRole() {
// ruService := service.NewRoleService()
// in := &command.UpdateRoleCommand{}
// if err := controller.Unmarshal(in); err != nil {
// controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
// } else {
// in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
// controller.Response(ruService.Update(in))
// func (controller *RoleController) UpdateRole() {
// ruService := service.NewRoleService()
// in := &command.UpdateRoleCommand{}
// if err := controller.Unmarshal(in); err != nil {
// controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
// } else {
// in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
// controller.Response(ruService.Update(in))
// }
// }
//}
//
//func (controller *RoleController) RemoveRole() {
// ruService := service.NewRoleService()
// in := &command.DeleteRoleCommand{}
// if err := controller.Unmarshal(in); err != nil {
// controller.Response(nil, application.ThrowError(application.ARG_ERROR, err.Error()))
// } else {
// in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
// controller.Response(ruService.Remove(in))
// }
//}
func
(
controller
*
RoleController
)
RemoveRole
()
{
ruService
:=
service
.
NewRoleService
()
in
:=
&
command
.
DeleteRoleCommand
{}
if
err
:=
controller
.
Unmarshal
(
in
);
err
!=
nil
{
controller
.
Response
(
nil
,
application
.
ThrowError
(
application
.
ARG_ERROR
,
err
.
Error
()))
}
else
{
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
controller
.
Response
(
ruService
.
Remove
(
in
))
}
}
func
(
controller
*
RoleController
)
ListForUserRole
()
{
ruService
:=
service
.
NewRoleService
()
...
...
@@ -53,7 +53,6 @@ func (controller *RoleController) ListForUserRole() {
}
else
{
ua
:=
middlewares
.
GetUser
(
controller
.
Ctx
)
in
.
CompanyId
=
ua
.
CompanyId
//in.CompanyId = middlewares.GetCompanyId(controller.Ctx)
controller
.
Response
(
ruService
.
ListForUser
(
in
))
}
}
...
...
pkg/port/beego/controllers/staff_assess_controller.go
查看文件 @
b92074a
...
...
@@ -78,10 +78,136 @@ func (c *StaffAssessController) CreateStaffAssessTask() {
c
.
Response
(
data
,
err
)
}
//获取员工自评详情
// 获取当前登录员工自评详情
func
(
c
*
StaffAssessController
)
GetAssessSelfMeInfo
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
AssessSelfInfoQuery
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
//TODO 获取当前用户信息
paramReq
.
CompanyId
=
1
paramReq
.
TargetUserId
=
1
data
,
err
:=
srv
.
GetAssessSelfInfo
(
paramReq
)
c
.
Response
(
data
,
err
)
}
//保存员工自评填写内容
//获取员工邀请的人
// 获取员工邀请的人
func
(
c
*
StaffAssessController
)
GetAssessInviteUser
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
GetAssessInviteUserQuery
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
//TODO 获取当前用户信息
paramReq
.
CompanyId
=
1
paramReq
.
UserId
=
1
data
,
err
:=
srv
.
GetAssessInviteUser
(
paramReq
)
c
.
Response
(
data
,
err
)
}
// 保持员工邀请的人
func
(
c
*
StaffAssessController
)
SaveAssessInviteUser
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
command
.
SaveAssessInvite
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
//TODO 获取当前用户信息
// paramReq.CompanyId = 1
// paramReq.UserId = 1
data
,
err
:=
srv
.
SaveAssessInviteUser
(
paramReq
)
c
.
Response
(
data
,
err
)
}
// 员工邀请的人选择列表
func
(
c
*
StaffAssessController
)
SelectAssessInviteUser
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
SelectAssessInviteUser
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
//TODO 获取当前用户信息
paramReq
.
CompanyId
=
1
paramReq
.
TargetUserId
=
1
data
,
err
:=
srv
.
SelectAssessInviteUser
(
paramReq
)
c
.
Response
(
data
,
err
)
}
//保持员工邀请的人
// 获取我要执行360评估,用户列表和评估填写的值
func
(
c
*
StaffAssessController
)
ListInviteUserAssess
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
ListInviteUserAssessQuery
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
//TODO 获取当前用户信息
paramReq
.
CompanyId
=
1
paramReq
.
ExecutorId
=
1
data
,
err
:=
srv
.
ListInviteUserAssess
(
paramReq
)
c
.
Response
(
data
,
err
)
}
// 获取上级评估成员列表
func
(
c
*
StaffAssessController
)
ListSupperAssess
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
ListSupperAssessQuery
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
//TODO 获取当前用户信息
paramReq
.
CompanyId
=
1
paramReq
.
ExecutorId
=
1
data
,
err
:=
srv
.
ListSupperAssess
(
paramReq
)
c
.
Response
(
data
,
err
)
}
// 获取员工自评详情
func
(
c
*
StaffAssessController
)
GetAssessSelfInfo
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
AssessSelfInfoQuery
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
paramReq
.
CompanyId
=
1
data
,
err
:=
srv
.
GetAssessSelfInfo
(
paramReq
)
c
.
Response
(
data
,
err
)
}
// 获取评估内容详情
func
(
c
*
StaffAssessController
)
GetAssessInfo
()
{
srv
:=
service
.
NewStaffAssessServeice
()
paramReq
:=
&
query
.
AssessInfoQuery
{}
err
:=
c
.
BindJSON
(
paramReq
)
if
err
!=
nil
{
e
:=
application
.
ThrowError
(
application
.
ARG_ERROR
,
"json 解析错误"
+
err
.
Error
())
c
.
Response
(
nil
,
e
)
return
}
paramReq
.
CompanyId
=
1
data
,
err
:=
srv
.
GetAssessInfo
(
paramReq
)
c
.
Response
(
data
,
err
)
}
...
...
pkg/port/beego/routers/evaluation_cycle_router.go
查看文件 @
b92074a
...
...
@@ -16,6 +16,7 @@ func init() {
web
.
NSRouter
(
"/:Id"
,
&
controllers
.
CycleController
{},
"Get:GetCycle"
),
web
.
NSRouter
(
"/list"
,
&
controllers
.
CycleController
{},
"Post:ListCycle"
),
web
.
NSRouter
(
"/statistic"
,
&
controllers
.
CycleController
{},
"Post:StatisticCycleUser"
),
web
.
NSRouter
(
"/templates"
,
&
controllers
.
CycleController
{},
"Post:CycleTemplateList"
),
)
web
.
AddNamespace
(
ns
)
}
...
...
pkg/port/beego/routers/role_router.go
查看文件 @
b92074a
...
...
@@ -12,7 +12,7 @@ func init() {
web
.
NSBefore
(
filters
.
AllowCors
(),
middlewares
.
CheckAdminToken
()),
//web.NSRouter("/", &controllers.RoleController{}, "Post:CreateRole"),
//web.NSRouter("/", &controllers.RoleController{}, "Put:UpdateRole"),
//
web.NSRouter("/", &controllers.RoleController{}, "Delete:RemoveRole"),
web
.
NSRouter
(
"/"
,
&
controllers
.
RoleController
{},
"Delete:RemoveRole"
),
//web.NSRouter("/:Id", &controllers.RoleController{}, "Get:GetRole"),
web
.
NSRouter
(
"/all"
,
&
controllers
.
RoleController
{},
"Post:ListForUserRole"
),
)
...
...
pkg/port/beego/routers/staff_assess_router.go
查看文件 @
b92074a
...
...
@@ -15,8 +15,13 @@ func init() {
// /v1/staff-assess/self/me/list
assessNS
:=
web
.
NewNamespace
(
"/v1/staff-assess"
,
// web.NSBefore(filters.AllowCors(), middlewares.CheckToken()),
web
.
NSCtrlPost
(
"/self/me/list"
,
(
*
controllers
.
StaffAssessController
)
.
AssessSelfMeList
),
//获取我的自评反馈列表
// web.NSCtrlPost("/self/me/info", (*controllers.StaffAssessController).AssessSelfMeList),
web
.
NSCtrlPost
(
"/self/me/list"
,
(
*
controllers
.
StaffAssessController
)
.
AssessSelfMeList
),
//获取我的自评反馈列表
web
.
NSCtrlPost
(
"/self/me/info"
,
(
*
controllers
.
StaffAssessController
)
.
GetAssessSelfMeInfo
),
//获取我的自评反馈详情
web
.
NSCtrlPost
(
"/me/invite-user"
,
(
*
controllers
.
StaffAssessController
)
.
GetAssessInviteUser
),
//获取邀请的员工
web
.
NSCtrlPost
(
"/me/save-invite-user"
,
(
*
controllers
.
StaffAssessController
)
.
SaveAssessInviteUser
),
//保存我邀请的员工
web
.
NSCtrlPost
(
"/me/invite-user/select"
,
(
*
controllers
.
StaffAssessController
)
.
SelectAssessInviteUser
),
//选择我邀请的员工
web
.
NSCtrlPost
(
"/self/info"
,
(
*
controllers
.
StaffAssessController
)
.
GetAssessSelfInfo
),
//获取我的自评反馈详情
web
.
NSCtrlPost
(
"/info"
,
(
*
controllers
.
StaffAssessController
)
.
GetAssessInfo
),
//获取我的自评反馈详情
)
web
.
AddNamespace
(
assessTaskNS
)
web
.
AddNamespace
(
assessNS
)
...
...
请
注册
或
登录
后发表评论