LR-20210131IOQH\Administrator
2021-06-28 0879713a184c48a0306a771a1e151387d5a9cf4c
zhengcaioa/Services/AdmPieceCheckService.cs
@@ -136,7 +136,7 @@
                         from kkk in ksssss.DefaultIfEmpty()
                         join h in _context.HrDepts.Where(x => x.RecStatus == "A" && x.QiyongStatus == "A")
                      on kkk.DeptId equals h.Id
                      on a.DeptId equals h.Id
                     into hsss
                         from hhh in hsss.DefaultIfEmpty()
@@ -160,7 +160,7 @@
                         where a.RecStatus == "A" 
                          && (string.IsNullOrWhiteSpace(searchEntity.WorkTime) || (a.WorkTime >= WorkTimestart && a.WorkTime <= WorkTimeend))
                          && (string.IsNullOrWhiteSpace(searchEntity.PayType) || ccc.Pieceratetype == searchEntity.PayType.Trim())
                           && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || kkk.DeptId == searchEntity.DeptId.Trim())
                           && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || a.DeptId == searchEntity.DeptId.Trim())
                          && (string.IsNullOrWhiteSpace(searchEntity.UserName) || kkk.UserName.Contains(searchEntity.UserName.Trim()))
@@ -231,5 +231,18 @@
            return result;
        }
        public List<AdmPieceCheckDTO> GetList(string userid, DateTime datemin, DateTime datemax)
        {
            var entity = _context.AdmPieceChecks.Where(x=> x.RecStatus == "A" && x.UserId == userid && x.WorkTime >= datemin && x.WorkTime < datemax).ToList();
            var result = _mapper.Map<List<AdmPieceCheckDTO>>(entity);
            return result;
        }
    }
}