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
7e8d8d22
Commit
7e8d8d22
authored
Apr 12, 2023
by
ruyun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
科室确认不用勾选也可以全部确认
parent
5787d30b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
performance/Performance.Api/Controllers/AttendanceController.cs
+2
-1
performance/Performance.Services/AttendanceService.cs
+14
-2
No files found.
performance/Performance.Api/Controllers/AttendanceController.cs
View file @
7e8d8d22
...
@@ -579,8 +579,9 @@ public ApiResponse IssueStatistics(int allotId)
...
@@ -579,8 +579,9 @@ public ApiResponse IssueStatistics(int allotId)
[
Route
(
"issue/choose"
)]
[
Route
(
"issue/choose"
)]
public
ApiResponse
ChooseStatistics
(
AttendanceIssueChoose
attendanceIssueChoose
)
public
ApiResponse
ChooseStatistics
(
AttendanceIssueChoose
attendanceIssueChoose
)
{
{
var
userid
=
claim
.
GetUserId
();
var
realName
=
claim
.
GetUserClaim
(
JwtClaimTypes
.
RealName
);
var
realName
=
claim
.
GetUserClaim
(
JwtClaimTypes
.
RealName
);
return
_attendanceService
.
ChooseStatistics
(
attendanceIssueChoose
,
realName
);
return
_attendanceService
.
ChooseStatistics
(
attendanceIssueChoose
,
userid
,
realName
);
}
}
#
endregion
#
endregion
}
}
...
...
performance/Performance.Services/AttendanceService.cs
View file @
7e8d8d22
...
@@ -1195,9 +1195,21 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
...
@@ -1195,9 +1195,21 @@ public ApiResponse IssueStatistics(int allotId, int userid, string realName, str
return
new
ApiResponse
(
ResponseType
.
OK
,
"下发成功"
);
return
new
ApiResponse
(
ResponseType
.
OK
,
"下发成功"
);
}
}
// 最终考勤结果驳回或确认无误((批量操作)
// 最终考勤结果驳回或确认无误((批量操作)
public
ApiResponse
ChooseStatistics
(
AttendanceIssueChoose
attendanceIssueChoose
,
string
realName
)
public
ApiResponse
ChooseStatistics
(
AttendanceIssueChoose
attendanceIssueChoose
,
int
userid
,
string
realName
)
{
{
var
issuedates
=
perforPerAttendanceIssueRepository
.
GetEntities
(
w
=>
w
.
AllotId
==
attendanceIssueChoose
.
AllotId
&&
attendanceIssueChoose
.
Issueid
.
Contains
(
w
.
Id
)).
ToList
();
var
issuedates
=
perforPerAttendanceIssueRepository
.
GetEntities
(
w
=>
w
.
AllotId
==
attendanceIssueChoose
.
AllotId
).
ToList
();
if
(
attendanceIssueChoose
.
Issueid
?.
Any
()
==
true
)
issuedates
=
issuedates
.
Where
(
w
=>
attendanceIssueChoose
.
Issueid
.
Contains
(
w
.
Id
)).
ToList
();
//当角色对应时过滤
var
userInfo
=
_userRepository
.
GetUser
(
userid
);
if
(
userInfo
?.
User
==
null
)
throw
new
NotImplementedException
(
"当前用户不存在"
);
if
(
userInfo
?.
URole
==
null
)
throw
new
NotImplementedException
(
"当前用户暂未分配角色"
);
var
unitTypes
=
UnitTypeUtil
.
GetMaps
(
userInfo
?.
URole
.
Type
??
0
);
if
(
unitTypes
?.
Any
()
==
true
)
issuedates
=
issuedates
.
Where
(
w
=>
w
.
AccountingUnit
==
userInfo
.
User
.
Department
&&
UnitTypeUtil
.
Is
(
w
.
UnitType
,
unitTypes
)).
ToList
();
foreach
(
var
item
in
issuedates
)
foreach
(
var
item
in
issuedates
)
{
{
item
.
State
=
(
int
)
attendanceIssueChoose
.
state
;
item
.
State
=
(
int
)
attendanceIssueChoose
.
state
;
...
...
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