From ea037964dba48654bdaf7169517c64508984841e Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期一, 19 七月 2021 14:53:45 +0800 Subject: [PATCH] 今日开发: 工作考评 按部门排序。不显示离职员工 工作统计,去掉标题 所有查询,只选择开始或者结束日期,自动补充另外一个日期 工作统计增加根据日期查询,只显示有数据的项 增加全员工作统计菜单,可以查询每个每个在职员工的工作统计 --- zhengcaioa/Services/ProjectService.cs | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs index 14bf1cf..05fd927 100644 --- a/zhengcaioa/Services/ProjectService.cs +++ b/zhengcaioa/Services/ProjectService.cs @@ -333,6 +333,16 @@ sql.Append(" and exists ( select b.[ProjectId] from [Projectzhongbiao] b where a.[Id]=b.[ProjectId] and (b.[defen]-a.[drhx_defen]) <= " + aaaa + " ) "); } } + if (!string.IsNullOrWhiteSpace(searchEntity.Baojiachaxiaoyu)) + { + decimal aaaa = 0; + decimal.TryParse(searchEntity.Baojiachaxiaoyu, out aaaa); + if (aaaa > 0) + { + sql.Append(" and exists ( select b.[ProjectId] from [Projectzhongbiao] b where a.[Id]=b.[ProjectId] and (convert(numeric(10,2),b.[price] )-convert(numeric(10,2),a.[drhx_price] )) <= " + aaaa + " ) "); + } + } + if (!string.IsNullOrWhiteSpace(searchEntity.Fenchadayu)) { @@ -626,5 +636,16 @@ CacheHelperNetCore.CacheInsert("Projects", list); return list; } + + + public List<ProjectDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax) + { + + + 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; + } } } -- Gitblit v1.9.1