Commit ce1931bb by wyc

考勤上报状态不明确修改

parent 54f7ffcb
...@@ -115,7 +115,7 @@ public enum Type ...@@ -115,7 +115,7 @@ public enum Type
public enum Deduction public enum Deduction
{ {
核减 = 1, 核减 = 1,
不核减 = 2, 不核减 = 0,
} }
public enum State public enum State
{ {
......
...@@ -2271,8 +2271,8 @@ public void DeptReportRefresh(per_allot allot, int state, List<per_attendance_de ...@@ -2271,8 +2271,8 @@ public void DeptReportRefresh(per_allot allot, int state, List<per_attendance_de
var newEntities = computeResult var newEntities = computeResult
.Select(item => .Select(item =>
{ {
var deductionDays = 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.核减)).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 return new per_attendance_dept_report
{ {
AllotId = allot.ID, AllotId = allot.ID,
...@@ -2627,7 +2627,7 @@ public string ExcelDownload(List<Dictionary<string, object>> rows, string name, ...@@ -2627,7 +2627,7 @@ public string ExcelDownload(List<Dictionary<string, object>> rows, string name,
package.Save(); package.Save();
} }
return filepath; return filepath;
} }
#endregion #endregion
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment