Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 zhengcaioa/Services/AdmSigninService.cs

@@ -85,6 +85,20 @@
            return signin;
        }

        public AdmSignInDTO GetByUserAndDate(string userid, DateTime sgninDate)
        {
            AdmSignIn entity = _context.AdmSignIns.Where(x=>x.RecStatus == "A" &&  x.UserId == userid && x.SgninDate == sgninDate).FirstOrDefault();
            AdmSignInDTO signin = null;
            if (entity != null)
            {
                signin = _mapper.Map<AdmSignInDTO>(entity);
            }
            
            return signin;
        }

        

        public AdmSignInDTO GetTodaySignin(string userId)
        {
            ResultEntity resultEntity = new ResultEntity();
@@ -209,7 +223,7 @@
                          Afternoon = virtity(a.AfternoonIn, a.AfternoonOut),
                          Overtime = virtity(a.OvertimeIn, a.OvertimeOut)
                      }).ToList();
            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = dt.Count();
            var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            list = _mapper.Map<List<SigninListDTO>>(signinList);
@@ -345,7 +359,25 @@
            return leaveDTO;

        }
       

        public List<AdmAskLeaveDTO> GetAskLeaveByUserId(string UserId)
        {
            List<AdmAskLeave> admAskLeaveDTOs = _context.AdmAskLeaves.Where(e => e.RecStatus == "A" && e.ShenpiStatus == "A" && e.Creater == UserId).ToList();

            List<AdmAskLeaveDTO> leaveDTOs = _mapper.Map< List <AdmAskLeaveDTO>  >(admAskLeaveDTOs);
            return leaveDTOs;

        }

        public List<AdmAskLeaveOffDTO> GetAskLeaveOffByUserId(string UserId)
        {
            List<AdmAskLeaveOff> admAskLeaveOffs = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.ShenpiStatus == "A" && e.Creater == UserId).ToList();

            List<AdmAskLeaveOffDTO> leaveDTOs = _mapper.Map<List<AdmAskLeaveOffDTO>>(admAskLeaveOffs);
            return leaveDTOs;

        }

        public AdmAskLeaveOffDTO GetAskLeaveOff(string Id)
        {
            AdmAskLeaveOff entity = _context.AdmAskLeaveOffs.Where(e => e.RecStatus == "A" && e.Id == Id ).FirstOrDefault();