From 1c4f3bce3d88557b7ddb5f0a49b4be5e91b416f1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 14 十月 2021 13:42:33 +0800
Subject: [PATCH] 专家测试--题库管理
---
zhengcaioa/Services/UserService.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 501d8b6..e28f32d 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -29,7 +29,7 @@
public PltUser login(string user_sn, string password)
{
- var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A").FirstOrDefault();
+ var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A" && x.Zhiwustatus == "A" ).FirstOrDefault();
return user;
}
@@ -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);
@@ -393,6 +394,20 @@
var list = _mapper.Map<List<PltUserDTO>>(listUser.ToList());
return list;
}
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋椿鍔ㄧ姸鎬佺殑浜哄憳
+ /// </summary>
+ /// <returns></returns>
+ public List<PltUserDTO> GetListjisuankaoqin(DateTime dateminkaoqin, DateTime datemaxkaoqin)
+ {
+
+
+ var listUser = _context.PltUsers.Where(u => u.RecStatus == "A" && ( u.Zhiwustatus == "A" || ( u.Zhiwustatus =="D" && u.Outdate>= dateminkaoqin && u.Outdate < datemaxkaoqin )));
+
+ var list = _mapper.Map<List<PltUserDTO>>(listUser.ToList());
+ return list;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1