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

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 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;
@@ -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,7 +197,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);