增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

 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;
        }
    }
}