政采招标oa系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
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,7 +130,7 @@




                        




                         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()


@@ -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;


        }