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
18b4a427
Commit
18b4a427
authored
Apr 19, 2022
by
纪旭 韦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复调动记录无考勤类型报错
parent
91695c08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
performance/Performance.Services/AttendanceService.cs
+3
-3
No files found.
performance/Performance.Services/AttendanceService.cs
View file @
18b4a427
...
@@ -422,8 +422,8 @@ public HandsonTable GetAttendanceVacationHandsonTable(int allotId)
...
@@ -422,8 +422,8 @@ public HandsonTable GetAttendanceVacationHandsonTable(int allotId)
t
.
PersonnelName
,
t
.
PersonnelName
,
t
.
PersonnelNumber
,
t
.
PersonnelNumber
,
t
.
AttendanceName
,
t
.
AttendanceName
,
BegDate
=
t
.
BegDate
.
ToString
(
"d"
),
BegDate
=
t
.
BegDate
>
DateTime
.
MinValue
?
t
.
BegDate
.
ToString
(
"d"
)
:
t
.
BegDate
.
ToString
(
),
EndDate
=
t
.
EndDate
.
ToString
(
"d"
)
EndDate
=
t
.
EndDate
>
DateTime
.
MinValue
?
t
.
EndDate
.
ToString
(
"d"
)
:
t
.
EndDate
.
ToString
(
)
});
});
if
(
convertDate
==
null
)
if
(
convertDate
==
null
)
return
handson
;
return
handson
;
...
@@ -458,7 +458,7 @@ public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId)
...
@@ -458,7 +458,7 @@ public ApiResponse<List<RecordAttendcance>> GetAttendanceVacation(int allotId)
var
vacatione
=
perfoPperAttendanceVacationeRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
vacatione
=
perfoPperAttendanceVacationeRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
type
=
perfoPperAttendanceTypeRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
type
=
perfoPperAttendanceTypeRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
if
(
type
.
Count
==
0
)
if
(
type
.
Count
==
0
)
return
new
ApiResponse
<
List
<
RecordAttendcance
>>(
ResponseType
.
Fail
,
"没有考勤类型"
);
return
new
ApiResponse
<
List
<
RecordAttendcance
>>(
ResponseType
.
Fail
,
new
List
<
RecordAttendcance
>()
);
var
data
=
from
a
in
vacatione
var
data
=
from
a
in
vacatione
join
b
in
type
on
a
.
TypeId
equals
b
.
Id
into
temp
join
b
in
type
on
a
.
TypeId
equals
b
.
Id
into
temp
...
...
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