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
a9fa0b60
Commit
a9fa0b60
authored
May 26, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
路由修改
parent
40b261fb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
performance/Performance.Api/Controllers/SecondAllotController.cs
+1
-1
performance/Performance.DtoModels/Response/SecondResponse.cs
+6
-1
performance/Performance.Services/SecondAllotService.cs
+5
-2
No files found.
performance/Performance.Api/Controllers/SecondAllotController.cs
View file @
a9fa0b60
...
...
@@ -233,7 +233,7 @@ public ApiResponse SingleAwards([FromBody]WorkloadRequest request)
/// 二次绩效工作量类型列表
/// </summary>
/// <returns></returns>
[
Route
(
"api/second/
singl
e/list"
)]
[
Route
(
"api/second/
worktyp
e/list"
)]
[
HttpPost
]
public
ApiResponse
WorkTypeList
([
FromBody
]
WorkloadRequest
request
)
{
...
...
performance/Performance.DtoModels/Response/SecondResponse.cs
View file @
a9fa0b60
...
...
@@ -10,7 +10,7 @@ public class SecondResponse
public
List
<
BodyItem
>
BodyItems
{
get
;
set
;
}
}
public
class
HeadItem
public
class
HeadItem
:
ICloneable
{
public
string
FiledId
{
get
;
set
;
}
public
string
FiledName
{
get
;
set
;
}
...
...
@@ -23,6 +23,11 @@ public class HeadItem
/// <summary> 1 value相加值为1 </summary>
public
Nullable
<
int
>
SpecialAttr
{
get
;
set
;
}
public
Nullable
<
int
>
WorkType
{
get
;
set
;
}
public
object
Clone
()
{
return
MemberwiseClone
();
}
}
public
class
BodyItem
:
HeadItem
...
...
performance/Performance.Services/SecondAllotService.cs
View file @
a9fa0b60
...
...
@@ -298,7 +298,10 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
{
//无数据 根据IsBring带出历史二次绩效中需要带出的数据
result
.
BodyItems
=
GetBringItems
(
request
,
headItems
);
result
.
BodyItems
.
AddRange
(
Mapper
.
Map
<
List
<
BodyItem
>>(
headItems
.
Where
(
t
=>
t
.
Type
==
1
)));
var
bodys
=
Mapper
.
Map
<
List
<
BodyItem
>>(
headItems
.
Where
(
t
=>
t
.
Type
==
1
));
if
(
bodys
!=
null
&&
bodys
.
Any
())
bodys
.
ToList
().
ForEach
(
t
=>
t
.
RowNumber
=
-
1
);
result
.
BodyItems
.
AddRange
(
bodys
);
}
}
...
...
@@ -475,7 +478,7 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
for
(
int
i
=
0
;
i
<
headers
.
Length
;
i
++)
{
var
headItem
=
headers
[
i
]
;
var
headItem
=
(
HeadItem
)
headers
[
i
].
Clone
()
;
headItem
.
FiledName
=
(
i
%
2
==
0
)
?
item
.
TypeName
:
item
.
TypeName
.
Replace
(
"占比"
,
"金额"
);
headItem
.
FiledId
+=
item
.
Id
;
headItem
.
Sort
=
maxSortValue
+
sortindex
;
...
...
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