From ddd7b8e07e5d7f76e5ee28eaab91e75a419b3750 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 22 七月 2021 14:57:13 +0800
Subject: [PATCH] 今日开发 我的报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工作报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工资计算中的 新增注册会员 改为非手工几件登记，自动从系统读取
---
zhengcaioa/Services/UserService.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index b17abda..9e13482 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -189,6 +189,7 @@
updatepltUser.jibensalary = pltUser.jibensalary;
updatepltUser.jintiesalary = pltUser.jintiesalary;
updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
+ updatepltUser.Yaoqingma = pltUser.Yaoqingma;
}
_context.SaveChanges();
@@ -335,7 +336,7 @@
jintiesalaryName = a.jintiesalary.HasValue ? a.jintiesalary.Value.ToString("F2") : "",
geshuiqizheng = a.geshuiqizheng,
geshuiqizhengName = a.geshuiqizheng.HasValue ? a.geshuiqizheng.Value.ToString("F2") : "",
-
+ Yaoqingma = a.Yaoqingma,
}
).OrderBy(x => x.Usernumber).ToList();
@@ -347,7 +348,7 @@
// query = query.OrderByDescending(x => x.Modifytime).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var userlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
// list = _mapper.Map<List<PltUserDTO>>(userlist);
--
Gitblit v1.9.1