From f33ece65bdfd7b8354bd5046d4b9d2d600643b0f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 09 十月 2021 13:24:51 +0800
Subject: [PATCH] tijiao

---
 zhengcaioa/Services/LiaotianService.cs |   70 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/Services/LiaotianService.cs b/zhengcaioa/Services/LiaotianService.cs
index 15f76d7..6ddb2bb 100644
--- a/zhengcaioa/Services/LiaotianService.cs
+++ b/zhengcaioa/Services/LiaotianService.cs
@@ -55,6 +55,8 @@
                     updateliaotian.Problemtype = liaotian.Problemtype;
                     updateliaotian.Shiyongfatiao = liaotian.Shiyongfatiao;
                     updateliaotian.ChushuStatus = liaotian.ChushuStatus;
+                    updateliaotian.Shenheer = liaotian.Shenheer;
+                    updateliaotian.Shenhetime = liaotian.Shenhetime;
                 }
 
                 _context.SaveChanges();
@@ -164,6 +166,8 @@
                              Problemtype = a.Problemtype,
                              Shiyongfatiao = a.Shiyongfatiao,
                              ChushuStatus= a.ChushuStatus,
+                             Shenheer = a.Shenheer,
+                             Shenhetime = a.Shenhetime,
                          }
               )
               .Distinct() .OrderByDescending(x => x.Modifytime).ToList();
@@ -179,7 +183,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();
             //list = _mapper.Map<List<LiaotianDTO>>(lianlist);
@@ -339,5 +343,69 @@
 
             return result;
         }
+
+
+
+        public ResultEntity saveSysUpdatetime(SysUpdatetime sysUpdatetime)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            try
+            {
+
+                 
+                if (String.IsNullOrEmpty(sysUpdatetime.Id))
+                {
+                    sysUpdatetime.Id = Guid.NewGuid().ToString();
+                    _context.SysUpdatetimes.Add(sysUpdatetime);
+                }
+                else
+                {
+                    var updateliaotian = _context.SysUpdatetimes.Find(sysUpdatetime.Id);
+                    updateliaotian.Updatename = sysUpdatetime.Updatename;
+                    updateliaotian.Updatetime = sysUpdatetime.Updatetime;
+                   
+                }
+
+                _context.SaveChanges();
+                resultEntity.ReturnID = sysUpdatetime.Id;
+                resultEntity.Result = true;
+            }
+            catch (Exception ex)
+            {
+                resultEntity.Result = false;
+                resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�";
+
+            }
+            return resultEntity;
+        }
+
+        public SysUpdatetime GetSysUpdatetime(string updatename)
+        {
+
+            var entity = _context.SysUpdatetimes.Where(x=>x.Updatename == updatename).FirstOrDefault();
+
+            return entity;
+        }
+
+
+        public List<LiaotianDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.Liaotians.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+            var list = _mapper.Map<List<LiaotianDTO>>(listPosition);
+            return list;
+        }
+
+        public List<LiaotianDTO> GetListsalaryshenhe(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.Liaotians.Where(r => r.RecStatus == "A" && r.Shenheer == userid && r.Shenhetime >= datemin && r.Shenhetime < datemax).ToList();
+
+            var list = _mapper.Map<List<LiaotianDTO>>(listPosition);
+            return list;
+        }
     }
 }

--
Gitblit v1.9.1