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

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 zhengcaioa/Services/AdmEvaluateService.cs

@@ -171,7 +171,7 @@



            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            data.LoadData(searchEntity, lianlist);
@@ -257,8 +257,8 @@
                         from ccc in csssss.DefaultIfEmpty()


                         where a.RecStatus == "A"
                          
                         where a.RecStatus == "A" &&  a.Zhiwustatus == "A"

                          && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || a.DeptId == searchEntity.DeptId.Trim())

                          && (string.IsNullOrWhiteSpace(searchEntity.UserName) || a.UserName.Contains(searchEntity.UserName.Trim()))
@@ -293,15 +293,34 @@
                             Modifytime = a.Modifytime,

                         }
                ).OrderByDescending(x => x.UserSn).ToList();
                ).OrderByDescending(x => x.DeptId).ToList();



            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            data.LoadData(searchEntity, lianlist);
            return data;
        }



        public List<AdmEvaluateDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
        {


            // var listCooperVisits = _context.CooperVisits.Where(r => id.Contains(r.Id) && r.RecStatus == "A").Select(x => x.Viscustomer).ToList();

            var admEvaluates = _context.AdmEvaluates.Where(r => r.RecStatus == "A" && r.UserId == userid && r.Evaluatetime >= datemin && r.Evaluatetime < datemax).ToList();

            var result = _mapper.Map<List<AdmEvaluateDTO>>(admEvaluates);





            return result;
        }
    }
}