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
ce1931bb
Commit
ce1931bb
authored
May 30, 2023
by
wyc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤上报状态不明确修改
parent
54f7ffcb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
performance/Performance.DtoModels/Enum.cs
+1
-1
performance/Performance.Services/AttendanceService.cs
+3
-3
No files found.
performance/Performance.DtoModels/Enum.cs
View file @
ce1931bb
...
...
@@ -115,7 +115,7 @@ public enum Type
public
enum
Deduction
{
核减
=
1
,
不核减
=
2
,
不核减
=
0
,
}
public
enum
State
{
...
...
performance/Performance.Services/AttendanceService.cs
View file @
ce1931bb
...
...
@@ -2271,8 +2271,8 @@ public void DeptReportRefresh(per_allot allot, int state, List<per_attendance_de
var
newEntities
=
computeResult
.
Select
(
item
=>
{
var
deductionDays
=
item
.
Detial
.
Where
(
w
=>
w
.
Remark
.
Equals
(
Attendance
.
Deduction
.
核减
)).
Sum
(
w
=>
w
.
Value
);
var
noDeductionDays
=
item
.
Detial
.
Where
(
w
=>
!
w
.
Remark
.
Equals
(
Attendance
.
Deduction
.
核减
)).
Sum
(
w
=>
w
.
Value
);
var
deductionDays
=
item
.
Detial
.
Where
(
w
=>
w
.
Remark
.
Equals
(
Attendance
.
Deduction
.
核减
.
ToString
()
)).
Sum
(
w
=>
w
.
Value
);
var
noDeductionDays
=
item
.
Detial
.
Where
(
w
=>
w
.
Remark
.
Equals
(
Attendance
.
Deduction
.
不核减
.
ToString
()
)).
Sum
(
w
=>
w
.
Value
);
return
new
per_attendance_dept_report
{
AllotId
=
allot
.
ID
,
...
...
@@ -2627,7 +2627,7 @@ public string ExcelDownload(List<Dictionary<string, object>> rows, string name,
package
.
Save
();
}
return
filepath
;
}
}
#
endregion
}
}
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