提交

username@email.com

2022-08-27 6e2b929cf381e2320ba6e7dec56c0371124d2b51

 zhengcaioa/Services/AdmPieceCheckService.cs

@@ -47,7 +47,7 @@
                    updateproject.WorkPro = entity.WorkPro;
                    updateproject.Remark = entity.Remark;
                    updateproject.Gongzi = entity.Gongzi;

                    updateproject.Shuliang = entity.Shuliang;

                    updateproject.Remark = entity.Remark;
                    updateproject.RecStatus = entity.RecStatus;
@@ -130,13 +130,13 @@

                        

                         join k in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
                         join k in _context.PltUsers.Where(x => x.RecStatus == "A")
                 on a.UserId equals k.Id
                 into ksssss
                         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()))


@@ -184,7 +184,7 @@
                             WorkProName = ccc.Project,
                             Gongzi = a.Gongzi ?? 0,
                             Remark = a.Remark,

                             Shuliang = a.Shuliang ?? 0,

                             Creater = a.Creater,
                             Createtime = a.Createtime,
@@ -197,9 +197,13 @@

        

            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            data.Heji1 = Math.Round(query.Sum(x => x.Gongzi) ?? 0, 2);
            data.Heji2 = Math.Round(query.Sum(x => x.Shuliang ?? 0), 2);
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Gongzi) ?? 0, 2);
            data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shuliang ?? 0), 2);
            data.LoadData(searchEntity, lianlist);
            return data;
        }
@@ -231,5 +235,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;
        }
    }
}