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
15893460
Commit
15893460
authored
Apr 12, 2019
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
排序
parent
2294683e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
performance/Performance.EntityModels/Entity/im_employee.cs
+5
-2
performance/Performance.Services/EmployeeService.cs
+1
-1
performance/Performance.Services/SheetSevice.cs
+1
-1
No files found.
performance/Performance.EntityModels/Entity/im_employee.cs
View file @
15893460
...
...
@@ -32,9 +32,12 @@ public class im_employee
public
Nullable
<
int
>
SheetID
{
get
;
set
;
}
/// <summary>
/// 科室类别(例如 医技科室 临床科室 其他科室)
///
/// </summary>
public
Nullable
<
int
>
RowNumber
{
get
;
set
;
}
/// <summary>
/// 科室类别(例如 医技科室 临床科室 其他科室)
/// </summary>
public
string
AccountType
{
get
;
set
;
}
...
...
performance/Performance.Services/EmployeeService.cs
View file @
15893460
...
...
@@ -48,7 +48,7 @@ public im_employee GetEmployee(EmployeeRequest request)
public
List
<
im_employee
>
GetEmployeeList
(
int
allotId
)
{
var
employee
=
perforImemployeeRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
allotId
);
return
employee
?.
OrderBy
(
t
=>
t
.
AccountType
).
ThenBy
(
t
=>
t
.
AccountingUnit
).
ThenBy
(
t
=>
t
.
DoctorName
).
ToList
();
return
employee
?.
OrderBy
(
t
=>
t
.
RowNumber
).
ToList
();
}
/// <summary>
...
...
performance/Performance.Services/SheetSevice.cs
View file @
15893460
...
...
@@ -405,7 +405,7 @@ private void AccountBaiscExport(int sheetID, SheetExportResponse response)
private
void
EmployeeExport
(
int
sheetID
,
SheetExportResponse
response
)
{
var
employeeList
=
_perforImEmployeeRepository
.
GetEntities
(
t
=>
t
.
SheetID
==
sheetID
);
var
employeeList
=
_perforImEmployeeRepository
.
GetEntities
(
t
=>
t
.
SheetID
==
sheetID
)
.
OrderBy
(
t
=>
t
.
RowNumber
)
;
if
(
employeeList
!=
null
&&
employeeList
.
Count
()
>
0
)
{
...
...
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