Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
a5373e37
Commit
a5373e37
authored
Jun 23, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次分配审核后查看详情
parent
4f7b6d4a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
115 additions
and
9 deletions
+115
-9
performance/Performance.Api/Controllers/SecondAllotController.cs
+29
-0
performance/Performance.Api/wwwroot/Performance.Api.xml
+7
-0
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+43
-3
performance/Performance.DtoModels/Second/SecondBaseDto.cs
+11
-0
performance/Performance.DtoModels/Second/SecondColumnDictionary.cs
+24
-0
performance/Performance.DtoModels/Second/SecondLoadDto.cs
+1
-6
performance/Performance.Services/RedistributionService.cs
+0
-0
No files found.
performance/Performance.Api/Controllers/SecondAllotController.cs
View file @
a5373e37
...
...
@@ -797,6 +797,35 @@ public ApiResponse RedistributionEmployee([FromBody] SecondEmployeeDto request)
var
employees
=
_redistributionService
.
RedistributionEmployee
(
request
);
return
new
ApiResponse
(
ResponseType
.
OK
,
employees
);
}
/// <summary>
/// 二次分配审核后查看详情
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
Route
(
"api/second/redistribution/detail"
)]
[
HttpPost
]
public
ApiResponse
RedistributionDetail
([
FromBody
]
SecondBaseDto
request
)
{
if
(!
Enum
.
IsDefined
(
typeof
(
ComputeMode
),
request
.
ComputeMode
))
throw
new
PerformanceException
(
"暂不支持当前计算方式!"
);
var
second
=
secondAllotService
.
GetSecondAllot
(
request
.
SecondId
);
if
(
second
==
null
)
throw
new
PerformanceException
(
"参数SecondId无效!"
);
var
allot
=
_allotService
.
GetAllot
(
second
.
AllotId
.
Value
);
if
(
allot
==
null
)
throw
new
PerformanceException
(
"绩效记录不存在!"
);
// 年资职称绩效占比与工作量绩效占比 校验
var
loads
=
_redistributionService
.
GetWorkLoads
(
allot
.
HospitalId
,
second
.
UnitType
,
second
.
Department
);
var
workloadGroups
=
_redistributionService
.
GetTopWorkloadBodyGroups
(
loads
);
// 返回信息
var
(
head
,
rows
)
=
_redistributionService
.
RedistributionDetail
((
ComputeMode
)
request
.
ComputeMode
,
allot
,
second
);
var
dic
=
_redistributionService
.
GetTableHeaderDictionary
((
ComputeMode
)
request
.
ComputeMode
,
second
,
loads
,
workloadGroups
);
return
new
ApiResponse
(
ResponseType
.
OK
,
new
{
Head
=
head
,
Body
=
rows
,
Dic
=
dic
});
}
#
endregion
}
}
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
a5373e37
...
...
@@ -1654,6 +1654,13 @@
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.SecondAllotController.RedistributionDetail(Performance.DtoModels.SecondBaseDto)"
>
<summary>
二次分配审核后查看详情
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)"
>
<summary>
sheet 列表
...
...
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
a5373e37
...
...
@@ -3781,12 +3781,52 @@
纵向计算
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondEmployeeDto.ComputeMode"
>
<member
name=
"P:Performance.DtoModels.SecondBaseDto.ComputeMode"
>
<summary>
计算方式:11 不计算 12 横向计算 13 纵向计算
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Label"
>
<summary>
描述
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Key"
>
<summary>
主键
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.IsTrue"
>
<summary>
是否显示 true显示
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Fixed"
>
<summary>
计算方式:1 不计算 2 横向计算 3 纵向计算
是否固定
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondLoadDto.ComputeMode"
>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Sort"
>
<summary>
排序
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Site"
>
<summary>
位置 Top、Table
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Type"
>
<summary>
类型 单项奖励:SingleAwards,工作量:Workload
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondColumnDictionary.Color"
>
<summary>
颜色class名称
</summary>
</member>
<member
name=
"P:Performance.DtoModels.SecondEmployeeDto.ComputeMode"
>
<summary>
计算方式:11 不计算 12 横向计算 13 纵向计算
</summary>
...
...
performance/Performance.DtoModels/Second/SecondBaseDto.cs
0 → 100644
View file @
a5373e37
namespace
Performance.DtoModels
{
public
class
SecondBaseDto
{
public
int
SecondId
{
get
;
set
;
}
/// <summary>
/// 计算方式:11 不计算 12 横向计算 13 纵向计算
/// </summary>
public
int
ComputeMode
{
get
;
set
;
}
}
}
performance/Performance.DtoModels/Second/SecondColumnDictionary.cs
View file @
a5373e37
...
...
@@ -2,13 +2,37 @@
{
public
class
SecondColumnDictionary
{
/// <summary>
/// 描述
/// </summary>
public
string
Label
{
get
;
set
;
}
/// <summary>
/// 主键
/// </summary>
public
string
Key
{
get
;
set
;
}
/// <summary>
/// 是否显示 true显示
/// </summary>
public
bool
IsTrue
{
get
;
set
;
}
/// <summary>
/// 是否固定
/// </summary>
public
string
Fixed
{
get
;
set
;
}
/// <summary>
/// 排序
/// </summary>
public
int
Sort
{
get
;
set
;
}
/// <summary>
/// 位置 Top、Table
/// </summary>
public
string
Site
{
get
;
set
;
}
/// <summary>
/// 类型 单项奖励:SingleAwards,工作量:Workload
/// </summary>
public
string
Type
{
get
;
set
;
}
/// <summary>
/// 颜色class名称
/// </summary>
public
string
Color
{
get
;
set
;
}
public
SecondColumnDictionary
()
...
...
performance/Performance.DtoModels/Second/SecondLoadDto.cs
View file @
a5373e37
namespace
Performance.DtoModels
{
public
class
SecondLoadDto
public
class
SecondLoadDto
:
SecondBaseDto
{
public
int
SecondId
{
get
;
set
;
}
/// <summary>
/// 计算方式:11 不计算 12 横向计算 13 纵向计算
/// </summary>
public
int
ComputeMode
{
get
;
set
;
}
/// <summary>
/// 数据加载方式:0 保存,1 上次,2 字典
/// </summary>
...
...
performance/Performance.Services/RedistributionService.cs
View file @
a5373e37
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment