考勤怎么加带薪假的计算

username@email.com

2023-02-10 efad4f05e52c89f3b42774e313144abd039370e4

 zhengcaioa/Services/AdmAttendanceService.cs

@@ -54,7 +54,7 @@
                        updatepltRole.Createtime = AdmAttendance.Createtime;
                        updatepltRole.Modifier = AdmAttendance.Modifier;
                        updatepltRole.Modifytime = AdmAttendance.Modifytime;

                        updatepltRole.Daixinjia = AdmAttendance.Daixinjia;
                        updatepltRole.Chidao = AdmAttendance.Chidao;
                        updatepltRole.Zaotui = AdmAttendance.Zaotui;
                        updatepltRole.Kuanggong = AdmAttendance.Kuanggong;
@@ -87,6 +87,19 @@
            return AdmAttendanceDTO;
        }

        public AdmAttendanceDTO GetByUserAndDate(string userid, int year, int month)
        {
            var entity = _context.AdmAttendances.Where(x=>x.RecStatus=="A" &&  x.Userid == userid && x.Year == year && x.Month == month).FirstOrDefault();
            AdmAttendanceDTO dto = null;
            if (entity != null)
            {
                dto  = _mapper.Map<AdmAttendanceDTO>(entity);
            }
            
            return dto;
        }


        public ResultDataEntity<AdmAttendanceDTO> SearchByPaging(AdmAttendanceDTOSearch searchEntity)
        {
            ResultDataEntity<AdmAttendanceDTO> data = new ResultDataEntity<AdmAttendanceDTO>();
@@ -105,6 +118,8 @@
                            && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || b.DeptId == searchEntity.DeptId.Trim())
                              && (string.IsNullOrWhiteSpace(searchEntity.Userid) || b.DeptId == searchEntity.Userid.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.UserName) || b.UserName.Contains(searchEntity.UserName.Trim()))
                                  && (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || a.Year ==  DateTime.Parse(searchEntity.YearMonth.Trim()+"-01").Year)
                           && (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || a.Month == DateTime.Parse(searchEntity.YearMonth.Trim() + "-01").Month)
                         select new AdmAttendanceDTO
                         {
                             Id = a.Id,
@@ -118,6 +133,7 @@
                             Shijichuqin = a.Shijichuqin,
                             Qingjia = a.Qingjia,
                             Jiaban = a.Jiaban,
                             Daixinjia = a.Daixinjia,
                             Xiaojia = a.Xiaojia,
                             Islock = a.Islock,
                             RecStatus = a.RecStatus,
@@ -137,7 +153,7 @@



            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();

@@ -197,6 +213,7 @@
                             Shijichuqin = a.Shijichuqin,
                             Qingjia = a.Qingjia,
                             Jiaban = a.Jiaban,
                             Daixinjia = a.Daixinjia,
                             Xiaojia = a.Xiaojia,
                             Islock = a.Islock,
                             RecStatus = a.RecStatus,