考勤怎么加带薪假的计算

username@email.com

2023-02-10 efad4f05e52c89f3b42774e313144abd039370e4

 zhengcaioa/Services/AdmAttendanceDtlService.cs

@@ -52,9 +52,13 @@
                        updatepltRole.Createtime = AdmAttendanceDtl.Createtime;
                        updatepltRole.Modifier = AdmAttendanceDtl.Modifier;
                        updatepltRole.Modifytime = AdmAttendanceDtl.Modifytime;
                        updatepltRole.Chidaofenzhong = AdmAttendanceDtl.Chidaofenzhong;
                        updatepltRole.Zaotuifenzhong = AdmAttendanceDtl.Zaotuifenzhong;
                        updatepltRole.Shangwuchidaofenzhong = AdmAttendanceDtl.Shangwuchidaofenzhong;
                        updatepltRole.Xiawuchidaofenzhong = AdmAttendanceDtl.Xiawuchidaofenzhong;
                        updatepltRole.Shangwuzaotuifenzhong = AdmAttendanceDtl.Shangwuzaotuifenzhong;
                        updatepltRole.Xiawuzaotuifenzhong = AdmAttendanceDtl.Xiawuzaotuifenzhong;
                        updatepltRole.Kuanggongtianshu = AdmAttendanceDtl.Kuanggongtianshu;
                        updatepltRole.Iswork = AdmAttendanceDtl.Iswork;
                        updatepltRole.Daixinjia = AdmAttendanceDtl.Daixinjia;
                    }

                }
@@ -84,7 +88,21 @@
            return AdmAttendanceDtlDTO;
        }

    
        public AdmAttendanceDtlDTO GetByUserAndDate(string Attendanceid, DateTime SgninDate)
        {
            var entity = _context.AdmAttendanceDtls.Where(x => x.RecStatus == "A" && x.AttendanceId == Attendanceid && x.SgninDate == SgninDate ).FirstOrDefault();
            AdmAttendanceDtlDTO dto = null;
            if (entity != null)
            {
                dto = _mapper.Map<AdmAttendanceDtlDTO>(entity);
            }

            return dto;
        }




        public ResultEntity ModifyStatus(string id, string userid)
        {

@@ -139,13 +157,79 @@
                             Createtime = a.Createtime,
                             Modifier = a.Modifier,
                             Modifytime = a.Modifytime,

                             Chidaofenzhong = a.Chidaofenzhong,
                             Zaotuifenzhong = a.Zaotuifenzhong,
                             Daixinjia = a.Daixinjia,
                             Shangwuchidaofenzhong = a.Shangwuchidaofenzhong,
                             Xiawuchidaofenzhong = a.Xiawuchidaofenzhong,
                             Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
                             Xiawuzaotuifenzhong = a.Xiawuzaotuifenzhong,
                             Kuanggongtianshu = a.Kuanggongtianshu,
                             Iswork = a.Iswork
                         }).OrderByDescending(x => x.Createtime).ToList();

            return query;
        }



        /// <summary>
        /// 获取所有有效科目
        /// </summary>
        /// <returns></returns>
        public ResultDataEntity<AdmAttendanceDtlDTO> SearchByPaging(AdmAttendanceDtlDTOSearch searchEntity)
        {
            ResultDataEntity<AdmAttendanceDtlDTO> data = new ResultDataEntity<AdmAttendanceDtlDTO>();


            var query = (from a in _context.AdmAttendanceDtls//.Where(x => x.RecStatus == "A")



                         where a.RecStatus == "A"
                         && (string.IsNullOrWhiteSpace(searchEntity.AttendanceId) || a.AttendanceId == searchEntity.AttendanceId.Trim())
                           && (!searchEntity.SgninDate.HasValue || a.SgninDate == searchEntity.SgninDate)

                         select new AdmAttendanceDtlDTO
                         {
                             Id = a.Id,
                             AttendanceId = a.AttendanceId,
                             SgninDate = a.SgninDate,
                             MorningIn = a.MorningIn,
                             Daixinjia = a.Daixinjia,
                             MorningOut = a.MorningOut,
                             AfternoonIn = a.AfternoonIn,
                             AfternoonOut = a.AfternoonOut,
                             OvertimeIn = a.OvertimeIn,
                             OvertimeOut = a.OvertimeOut,
                             Qingjia = a.Qingjia,
                             Xiaojia = a.Xiaojia,
                             RecStatus = a.RecStatus,
                             Creater = a.Creater,
                             Createtime = a.Createtime,
                             Modifier = a.Modifier,
                             Modifytime = a.Modifytime,

                             Shangwuchidaofenzhong = a.Shangwuchidaofenzhong,
                             Xiawuchidaofenzhong = a.Xiawuchidaofenzhong,
                             Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
                             Xiawuzaotuifenzhong = a.Xiawuzaotuifenzhong,
                             Kuanggongtianshu = a.Kuanggongtianshu,
                             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)
            searchEntity.totalrows = query.Count();
            var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();

            data.LoadData(searchEntity, rolelist);
            return data;
        }
    }
}