考勤怎么加带薪假的计算

username@email.com

2023-02-10 efad4f05e52c89f3b42774e313144abd039370e4

 zhengcaioa/Services/AdmAttendanceDtlService.cs

@@ -58,6 +58,7 @@
                        updatepltRole.Xiawuzaotuifenzhong = AdmAttendanceDtl.Xiawuzaotuifenzhong;
                        updatepltRole.Kuanggongtianshu = AdmAttendanceDtl.Kuanggongtianshu;
                        updatepltRole.Iswork = AdmAttendanceDtl.Iswork;
                        updatepltRole.Daixinjia = AdmAttendanceDtl.Daixinjia;
                    }

                }
@@ -156,7 +157,7 @@
                             Createtime = a.Createtime,
                             Modifier = a.Modifier,
                             Modifytime = a.Modifytime,

                             Daixinjia = a.Daixinjia,
                             Shangwuchidaofenzhong = a.Shangwuchidaofenzhong,
                             Xiawuchidaofenzhong = a.Xiawuchidaofenzhong,
                             Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
@@ -193,7 +194,7 @@
                             AttendanceId = a.AttendanceId,
                             SgninDate = a.SgninDate,
                             MorningIn = a.MorningIn,

                             Daixinjia = a.Daixinjia,
                             MorningOut = a.MorningOut,
                             AfternoonIn = a.AfternoonIn,
                             AfternoonOut = a.AfternoonOut,
@@ -212,7 +213,15 @@
                             Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
                             Xiawuzaotuifenzhong = a.Xiawuzaotuifenzhong,
                             Kuanggongtianshu = a.Kuanggongtianshu,
                             Iswork = a.Iswork
                             Iswork = a.Iswork,
                             SgninDateName = a.SgninDate.HasValue? a.SgninDate.Value.ToString("yyyy-MM-dd"):"",
                             MorningInName = a.MorningIn.HasValue ? a.MorningIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",

                             MorningOutName = a.MorningOut.HasValue ? a.MorningOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                             AfternoonInName = a.AfternoonIn.HasValue ? a.AfternoonIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                             AfternoonOutName = a.AfternoonOut.HasValue ? a.AfternoonOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                             OvertimeInName = a.OvertimeIn.HasValue ? a.OvertimeIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                             OvertimeOutName = a.OvertimeOut.HasValue ? a.OvertimeOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                         }).OrderBy(x => x.SgninDate).ToList();

            //if (searchEntity.totalrows == 0)