From 558dae4a18d393ac38daa43a354e8bc9a22e4e26 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 02 十一月 2023 16:52:59 +0800
Subject: [PATCH] 班次安排座位

---
 zhengcaioa/Services/ProjectService.cs |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 6fcde97..7b3b87e 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -231,7 +231,7 @@
                         }
                     }
                 }
-                CacheHelperNetCore.CacheNull("Projects");
+                //CacheHelperNetCore.CacheNull("Projects");
 
 
                 _context.SaveChanges();
@@ -860,16 +860,12 @@
         /// <returns></returns>
         public List<ProjectDTO> GetList()
         {
-            List<ProjectDTO> projectDTOs = (List<ProjectDTO>)CacheHelperNetCore.CacheValue("Projects");
-            if (projectDTOs!=null&& projectDTOs.Count > 0)
-            {
-                return projectDTOs;
-            }
+             
 
             var listPosition = _context.Projects.Where(r => r.RecStatus == "A").ToList();
            
             var list = _mapper.Map<List<ProjectDTO>>(listPosition);
-            CacheHelperNetCore.CacheInsert("Projects", list);
+            
             return list;
         }
 
@@ -881,6 +877,16 @@
             var listPosition = _context.Projects.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
 
             var list = _mapper.Map<List<ProjectDTO>>(listPosition);
+            return list;
+        }
+
+        public List<ZhengfuProjectDTO> GetListsalaryzhengfu(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _webcontext.ZhengfuProjects.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+            var list = _mapper.Map<List<ZhengfuProjectDTO>>(listPosition);
             return list;
         }
 
@@ -1400,5 +1406,48 @@
 
             return resultEntity;
         }
+
+
+        public ResultEntity GetZhengfuProjectDTOByTitle(string Title, string Id, DateTime? NoticeTime)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            resultEntity.Result = true;
+            if(!string.IsNullOrWhiteSpace(Title) && NoticeTime.HasValue)
+            {
+                var checkUserSn = _webcontext.ZhengfuProjects.Where(x => x.Title == Title && x.RecStatus == "A" && x.Id != Id && x.NoticeTime >= NoticeTime.Value.AddDays(-1) && x.NoticeTime <= NoticeTime.Value.AddDays(1)).FirstOrDefault();
+                if (checkUserSn != null && (string.IsNullOrWhiteSpace(Id) || (!string.IsNullOrWhiteSpace(Id) && checkUserSn.Id != Id)))
+                {
+                    resultEntity.Result = false;
+                    resultEntity.Message = "璇ラ〉闈㈠凡缁忓瓨鍦�";
+
+                }
+            }
+           
+
+
+            return resultEntity;
+        }
+
+       
+        public ResultEntity saveProjectfasongxiaoxi(Projectfasongxiaoxi project)
+        {
+            ResultEntity resultEntity = new ResultEntity();
+            try
+            {
+
+                project.Id = Guid.NewGuid().ToString();
+                _context.Projectfasongxiaoxis.Add(project);
+                _context.SaveChanges();
+                resultEntity.ReturnID = project.Id;
+                resultEntity.Result = true;
+            }
+            catch (Exception ex)
+            {
+                resultEntity.Result = false;
+                resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�";
+
+            }
+            return resultEntity;
+        }
     }
 }

--
Gitblit v1.9.1