提交

username@email.com

2022-08-27 6e2b929cf381e2320ba6e7dec56c0371124d2b51

 zhengcaioa/Services/AdmAttendanceService.cs

@@ -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,
@@ -137,7 +152,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();