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
1ff9f0e7
Commit
1ff9f0e7
authored
Oct 28, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/deptdetail' into v2020morge
parents
92803e8d
ac7614ad
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
performance/Performance.Api/Controllers/ComputeController.cs
+5
-0
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+3
-0
performance/Performance.DtoModels/Response/DeptDetailResponse.cs
+2
-0
performance/Performance.Services/ComputeService.cs
+0
-0
No files found.
performance/Performance.Api/Controllers/ComputeController.cs
View file @
1ff9f0e7
...
@@ -172,6 +172,11 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request)
...
@@ -172,6 +172,11 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request)
var
response
=
_computeService
.
SpecialDeptDetail
(
second
);
var
response
=
_computeService
.
SpecialDeptDetail
(
second
);
return
new
ApiResponse
(
ResponseType
.
OK
,
response
);
return
new
ApiResponse
(
ResponseType
.
OK
,
response
);
}
}
else
if
(
second
!=
null
&&
second
.
UnitType
==
UnitType
.
行政后勤
.
ToString
())
{
var
response
=
_computeService
.
DeptOfficeDetail
(
request
.
AccountID
);
return
new
ApiResponse
(
ResponseType
.
OK
,
response
);
}
else
else
{
{
var
response
=
_computeService
.
DeptDetail
(
request
.
AccountID
);
var
response
=
_computeService
.
DeptDetail
(
request
.
AccountID
);
...
...
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
1ff9f0e7
...
@@ -2706,6 +2706,9 @@
...
@@ -2706,6 +2706,9 @@
<member
name=
"P:Performance.DtoModels.DetailDtos`1.GroupBasis"
>
<member
name=
"P:Performance.DtoModels.DetailDtos`1.GroupBasis"
>
<summary>
分组依据
</summary>
<summary>
分组依据
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.DetailModule.JobNumber"
>
<summary>
工号
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DetailModule.ItemName"
>
<member
name=
"P:Performance.DtoModels.DetailModule.ItemName"
>
<summary>
明细项
</summary>
<summary>
明细项
</summary>
</member>
</member>
...
...
performance/Performance.DtoModels/Response/DeptDetailResponse.cs
View file @
1ff9f0e7
...
@@ -67,6 +67,8 @@ public class DetailDtos : DetailDtos<DetailModule>
...
@@ -67,6 +67,8 @@ public class DetailDtos : DetailDtos<DetailModule>
public
class
DetailModule
public
class
DetailModule
{
{
/// <summary> 工号 </summary>
public
string
JobNumber
{
get
;
set
;
}
/// <summary> 明细项 </summary>
/// <summary> 明细项 </summary>
public
string
ItemName
{
get
;
set
;
}
public
string
ItemName
{
get
;
set
;
}
...
...
performance/Performance.Services/ComputeService.cs
View file @
1ff9f0e7
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