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
4efb4431
Commit
4efb4431
authored
Dec 03, 2021
by
纪旭 韦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复绩效核算3个接口异常问题
parent
327a87e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletions
+11
-1
performance/Performance.Api/Controllers/EmployeeController.cs.rej
+9
-0
performance/Performance.Services/ComputeService.cs
+2
-1
No files found.
performance/Performance.Api/Controllers/EmployeeController.cs.rej
0 → 100644
View file @
4efb4431
diff a/performance/Performance.Api/Controllers/EmployeeController.cs b/performance/Performance.Api/Controllers/EmployeeController.cs (rejected hunks)
@@ -824,6 +824,7 @@
if (allotId <= 0)
return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
+ var result = employeeService.GetGatherTotal(allotId, request);
return new ApiResponse(ResponseType.OK, result);
}
performance/Performance.Services/ComputeService.cs
View file @
4efb4431
...
...
@@ -206,7 +206,8 @@ public List<ResComputeResponse> GetCompute(int allotId, int type)
}
else
{
var
compute
=
_perforRescomputeRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
allotId
&&
t
.
AccountType
==
items
.
FirstOrDefault
(
p
=>
p
.
Value
==
type
).
Name
);
var
name
=
items
.
FirstOrDefault
(
p
=>
p
.
Value
==
type
)?.
Name
??
""
;
var
compute
=
_perforRescomputeRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
allotId
&&
t
.
AccountType
==
name
);
if
(
type
==
(
int
)
AccountUnitType
.
行政工勤
)
compute
=
compute
?.
Where
(
w
=>
w
.
NeedSecondAllot
==
"否"
)?.
ToList
();
...
...
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