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
d5cc6d40
Commit
d5cc6d40
authored
Mar 31, 2023
by
wyc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘考勤下发’ 状态判断更改
parent
e109d957
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
performance/Performance.Api/Controllers/AttendanceController.cs
+1
-1
performance/Performance.Services/AttendanceService.cs
+3
-3
No files found.
performance/Performance.Api/Controllers/AttendanceController.cs
View file @
d5cc6d40
...
@@ -408,7 +408,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
...
@@ -408,7 +408,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
/// <returns></returns>
/// <returns></returns>
[
HttpPost
]
[
HttpPost
]
[
Route
(
"issue/check"
)]
[
Route
(
"issue/check"
)]
public
ApiResponse
<
List
<
PerAttendanceIssueDto
>>
PreConfirmationDisplay
(
int
allotId
,
string
unitType
,
string
accountingUnit
,
Attendance
.
Stat
e
state
)
public
ApiResponse
<
List
<
PerAttendanceIssueDto
>>
PreConfirmationDisplay
(
int
allotId
,
string
unitType
,
string
accountingUnit
,
Attendance
.
OperationTyp
e
state
)
{
{
var
userid
=
claim
.
GetUserId
();
var
userid
=
claim
.
GetUserId
();
return
_attendanceService
.
PreConfirmationDisplay
(
allotId
,
userid
,
unitType
,
accountingUnit
,
state
);
return
_attendanceService
.
PreConfirmationDisplay
(
allotId
,
userid
,
unitType
,
accountingUnit
,
state
);
...
...
performance/Performance.Services/AttendanceService.cs
View file @
d5cc6d40
...
@@ -854,7 +854,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
...
@@ -854,7 +854,7 @@ public ApiResponse<List<AttendanceAuditDetail>> AuditDetail(int allotId, string
return
new
ApiResponse
<
List
<
AttendanceAuditDetail
>>(
ResponseType
.
OK
,
items
);
return
new
ApiResponse
<
List
<
AttendanceAuditDetail
>>(
ResponseType
.
OK
,
items
);
}
}
public
ApiResponse
<
List
<
PerAttendanceIssueDto
>>
PreConfirmationDisplay
(
int
allotId
,
int
userid
,
string
unitType
,
string
accountingUnit
,
Attendance
.
Stat
e
state
)
public
ApiResponse
<
List
<
PerAttendanceIssueDto
>>
PreConfirmationDisplay
(
int
allotId
,
int
userid
,
string
unitType
,
string
accountingUnit
,
Attendance
.
OperationTyp
e
state
)
{
{
var
statistics
=
GetAttendanceStatistics
(
allotId
,
userid
).
Data
;
var
statistics
=
GetAttendanceStatistics
(
allotId
,
userid
).
Data
;
var
issues
=
perforPerAttendanceIssueRepository
.
GetEntities
(
w
=>
w
.
AllotId
==
allotId
);
var
issues
=
perforPerAttendanceIssueRepository
.
GetEntities
(
w
=>
w
.
AllotId
==
allotId
);
...
@@ -914,14 +914,14 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
...
@@ -914,14 +914,14 @@ public ApiResponse<List<PerAttendanceIssueDto>> PreConfirmationDisplay(int allot
issuedates
=
issuedates
.
Where
(
w
=>
w
.
UnitType
==
unitType
).
ToList
();
issuedates
=
issuedates
.
Where
(
w
=>
w
.
UnitType
==
unitType
).
ToList
();
if
(!
string
.
IsNullOrEmpty
(
accountingUnit
))
if
(!
string
.
IsNullOrEmpty
(
accountingUnit
))
issuedates
=
issuedates
.
Where
(
w
=>
w
.
AccountingUnit
==
accountingUnit
).
ToList
();
issuedates
=
issuedates
.
Where
(
w
=>
w
.
AccountingUnit
==
accountingUnit
).
ToList
();
if
(
state
!=
0
)
if
(
(
int
)
state
==(
int
)
Attendance
.
OperationType
.
新增
||
(
int
)
state
==
(
int
)
Attendance
.
OperationType
.
修改
||
(
int
)
state
==
(
int
)
Attendance
.
OperationType
.
删除
)
issuedates
=
issuedates
.
Where
(
w
=>
w
.
OperationType
==
(
int
)
state
).
ToList
();
issuedates
=
issuedates
.
Where
(
w
=>
w
.
OperationType
==
(
int
)
state
).
ToList
();
return
new
ApiResponse
<
List
<
PerAttendanceIssueDto
>>(
ResponseType
.
OK
,
issuedates
);
return
new
ApiResponse
<
List
<
PerAttendanceIssueDto
>>(
ResponseType
.
OK
,
issuedates
);
}
}
//下发
//下发
public
ApiResponse
IssueStatistics
(
int
allotId
,
int
userid
,
string
realName
,
string
unitType
=
""
,
string
accountingUnit
=
""
,
Attendance
.
Stat
e
state
=
0
)
public
ApiResponse
IssueStatistics
(
int
allotId
,
int
userid
,
string
realName
,
string
unitType
=
""
,
string
accountingUnit
=
""
,
Attendance
.
OperationTyp
e
state
=
0
)
{
{
var
allot
=
perforPerallotRepository
.
GetEntity
(
w
=>
w
.
ID
==
allotId
);
var
allot
=
perforPerallotRepository
.
GetEntity
(
w
=>
w
.
ID
==
allotId
);
if
(
allot
==
null
)
if
(
allot
==
null
)
...
...
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