From 1c4f3bce3d88557b7ddb5f0a49b4be5e91b416f1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 14 十月 2021 13:42:33 +0800
Subject: [PATCH] 专家测试--题库管理

---
 zhengcaioa/Services/AdmPieceCheckService.cs |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index 963a1fc..3f3b384 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;
@@ -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,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);
@@ -231,5 +231,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;
+        }
     }
 }

--
Gitblit v1.9.1