From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/Services/AdmPieceCheckService.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index d6f3fca..a404d55 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/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);

--
Gitblit v1.9.1