From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期三, 04 八月 2021 14:29:15 +0800 Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增,短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字, 问题查询打开直接默认未审核,不要停两秒再刷新 项目新增 增加字段:采购预算 万元 工作考评 考聘不称职当天无工资 --- zhengcaioa/Services/DailyManagementService.cs | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/zhengcaioa/Services/DailyManagementService.cs b/zhengcaioa/Services/DailyManagementService.cs index b8ecd87..06b38cd 100644 --- a/zhengcaioa/Services/DailyManagementService.cs +++ b/zhengcaioa/Services/DailyManagementService.cs @@ -323,6 +323,33 @@ // }).ToList(); return query.Count; } + + /// <summary> + /// 鏌愪竴涓汉鐨勫伐浣滄彁閱� + /// </summary> + /// <param name="userid">鐢ㄦ埛ID</param> + /// <returns></returns> + public List<AdmMemoBookDTO> GetRemindsalary(string userid, DateTime datemin, DateTime datemax, string KaoHe) + { + var query = _context.AdmMemoBooks + .Where(e => e.RecStatus == "A" && e.ToUserId == userid && e.KaoHe == KaoHe && e.Modifytime >= datemin && e.Modifytime < datemax) + .ToList(); + //var dt = (from a in query + // join b in _context.PltUsers.Where(e => e.RecStatus == "A") + // on a.Creater equals b.Id + // select new AdmMemoBookDTO + // { + // Id = a.Id, + // Rtype = a.Rtype, + // Creater = b.UserName, + // Time = a.Time, + // Context = a.Context, + // Createtime = a.Createtime + // }).ToList(); + var list = _mapper.Map<List<AdmMemoBookDTO>>(query); + return list; + } + public ResultEntity SaveMemoBook(AdmMemoBookDTO mbDTO) { ResultEntity resultEntity = new ResultEntity(); -- Gitblit v1.9.1