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/HrSalaryService.cs | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs index 656f00c..20af5ad 100644 --- a/zhengcaioa/Services/HrSalaryService.cs +++ b/zhengcaioa/Services/HrSalaryService.cs @@ -380,7 +380,7 @@ - if (searchEntity.totalrows == 0) + //if (searchEntity.totalrows == 0) searchEntity.totalrows = query.Count(); var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList(); @@ -512,7 +512,7 @@ - if (searchEntity.totalrows == 0) + //if (searchEntity.totalrows == 0) searchEntity.totalrows = query.Count(); var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList(); @@ -677,10 +677,13 @@ temp.reason = model.reason; temp.amount = model.amount; temp.basis = model.basis; - temp.sub_time = DateTime.Now; + temp.shenpi_status = model.shenpi_status; + + } else { + model.id = Guid.NewGuid().ToString(); model.sub_time = DateTime.Now; model.status = "A"; _context.HrSalaryAppeal.Add(model); @@ -705,12 +708,20 @@ /// <param name="id"></param> /// <param name="user"></param> /// <returns></returns> - public HrSalaryAppeal GetAppeal(string id,string user) + public HrSalaryAppeal GetAppeal(string id = "", string user = "", string salaryId = "") { HrSalaryAppeal hd = new HrSalaryAppeal(); try { - hd = _context.HrSalaryAppeal.Where(e => e.salary_id == id && e.sub_user == user).SingleOrDefault(); + if (!string.IsNullOrEmpty(salaryId)) + { + hd = _context.HrSalaryAppeal.Where(e => e.salary_id == salaryId && e.sub_user == user && e.status == "A").FirstOrDefault(); + } + else + { + hd = _context.HrSalaryAppeal.Where(e => e.id == id && e.status == "A").FirstOrDefault(); + } + } catch (Exception er) { @@ -819,7 +830,7 @@ }).OrderByDescending(x => x.Modifytime).ToList(); - if (searchEntity.totalrows == 0) + //if (searchEntity.totalrows == 0) searchEntity.totalrows = list.Count(); var rolelist = list.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList(); -- Gitblit v1.9.1