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
9dbacb68
Commit
9dbacb68
authored
Sep 13, 2022
by
纪旭 韦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员字典显示排序倒序,粘贴少数据问题
parent
690d5548
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
performance/Performance.Repository/PerforPeremployeeRepository.cs
+1
-1
performance/Performance.Services/PersonService.cs
+1
-1
performance/Performance.Services/ReportGlobalService.cs
+1
-1
No files found.
performance/Performance.Repository/PerforPeremployeeRepository.cs
View file @
9dbacb68
...
@@ -24,7 +24,7 @@ public partial class PerforPeremployeeRepository : PerforRepository<per_employee
...
@@ -24,7 +24,7 @@ public partial class PerforPeremployeeRepository : PerforRepository<per_employee
public
new
PageList
<
per_employee
>
GetEntitiesForPaging
(
int
pageNumber
,
int
pageSize
,
Expression
<
Func
<
per_employee
,
bool
>>
exp
)
public
new
PageList
<
per_employee
>
GetEntitiesForPaging
(
int
pageNumber
,
int
pageSize
,
Expression
<
Func
<
per_employee
,
bool
>>
exp
)
{
{
IQueryable
<
per_employee
>
queryableAuthors
=
context
.
Set
<
per_employee
>().
Where
(
exp
).
OrderBy
(
w
=>
w
.
IsVerify
).
ThenBy
(
t
=>
t
.
Id
);
IQueryable
<
per_employee
>
queryableAuthors
=
context
.
Set
<
per_employee
>().
Where
(
exp
).
OrderBy
Descending
(
w
=>
w
.
Id
).
ThenBy
(
t
=>
t
.
IsVerify
);
return
PageList
<
per_employee
>.
Create
(
queryableAuthors
,
pageNumber
,
pageSize
);
return
PageList
<
per_employee
>.
Create
(
queryableAuthors
,
pageNumber
,
pageSize
);
}
}
...
...
performance/Performance.Services/PersonService.cs
View file @
9dbacb68
...
@@ -952,7 +952,7 @@ public ApiResponse BathSavePerson(int allotId, int HospitalId, SaveCollectData r
...
@@ -952,7 +952,7 @@ public ApiResponse BathSavePerson(int allotId, int HospitalId, SaveCollectData r
var
delPersonsNum
=
new
List
<
string
>();
var
delPersonsNum
=
new
List
<
string
>();
foreach
(
var
data
in
newEmployees
)
foreach
(
var
data
in
newEmployees
)
{
{
var
any
=
employees
.
Any
(
w
=>
w
.
Department
?.
Trim
()
==
data
.
Department
?.
Trim
()
&&
w
.
DoctorName
?.
Trim
()
==
data
.
DoctorName
?.
Trim
()
);
var
any
=
employees
.
Any
(
w
=>
w
.
UnitType
?.
Trim
()
==
data
.
UnitType
?.
Trim
()
&&
w
.
Department
?.
Trim
()
==
data
.
Department
?.
Trim
()
&&
w
.
DoctorName
?.
Trim
()
==
data
.
DoctorName
?.
Trim
()
&&
w
.
PersonnelNumber
==
data
.
PersonnelNumber
);
if
(!
string
.
IsNullOrEmpty
(
data
.
Department
?.
Trim
())
&&
!
string
.
IsNullOrEmpty
(
data
.
AccountingUnit
?.
Trim
())
&&
!
string
.
IsNullOrEmpty
(
data
.
DoctorName
?.
Trim
())
&&
!
any
)
if
(!
string
.
IsNullOrEmpty
(
data
.
Department
?.
Trim
())
&&
!
string
.
IsNullOrEmpty
(
data
.
AccountingUnit
?.
Trim
())
&&
!
string
.
IsNullOrEmpty
(
data
.
DoctorName
?.
Trim
())
&&
!
any
)
{
{
...
...
performance/Performance.Services/ReportGlobalService.cs
View file @
9dbacb68
...
@@ -559,7 +559,7 @@ private T GetCellValue<T>(IRow row, List<string> columns, string key)
...
@@ -559,7 +559,7 @@ private T GetCellValue<T>(IRow row, List<string> columns, string key)
var
data
=
(
from
t1
in
pdata
var
data
=
(
from
t1
in
pdata
join
t2
in
tdata
join
t2
in
tdata
on
t1
.
PersonnelNumber
equals
t2
.
PersonnelNumber
into
temp
on
t1
.
PersonnelNumber
equals
t2
.
PersonnelNumber
into
temp
from
t
in
temp
.
DefaultIfEmpty
()
from
t
in
temp
.
DefaultIfEmpty
()
orderby
t1
.
Id
descending
select
new
select
new
{
{
PersonnelNumber
=
t1
.
PersonnelNumber
,
PersonnelNumber
=
t1
.
PersonnelNumber
,
...
...
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