From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/Services/UserService.cs | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 9e13482..4387ca5 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;
}
@@ -190,6 +190,7 @@
updatepltUser.jintiesalary = pltUser.jintiesalary;
updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
updatepltUser.Yaoqingma = pltUser.Yaoqingma;
+ updatepltUser.HetongDateEnd = pltUser.HetongDateEnd;
}
_context.SaveChanges();
@@ -304,6 +305,8 @@
BasicPrice = a.BasicPrice,
ShiyongPrice = a.ShiyongPrice,
ShiyongPriceName = a.ShiyongPrice.HasValue ? a.ShiyongPrice.Value.ToString("F2") : "",
+ HetongDateEnd = a.HetongDateEnd,
+ HetongDateEndName = a.HetongDateEnd.HasValue ? a.HetongDateEnd.Value.ToString("yyyy-MM-dd") : "",
ShebaodateName = a.Shebaodate.HasValue ? a.Shebaodate.Value.ToString("yyyy-MM-dd") : "",
@@ -408,6 +411,67 @@
var list = _mapper.Map<List<PltUserDTO>>(listUser.ToList());
return list;
}
+
+
+ public ResultEntity savePltUserFenpeiDate(DateTime? FenpeiDate,string userId)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+
+ try {
+
+ var updatepltUser = _context.PltUsers.Find(userId);
+
+ updatepltUser.FenpeiDate = FenpeiDate;
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = userId;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+
+ public ResultEntity saveCustomerYwjl(CustomerYwjl DTO)
+ {
+
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+
+
+
+ DTO.Id = Guid.NewGuid().ToString();
+
+ _context.CustomerYwjls.Add(DTO);
+
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = DTO.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+
+ public List<CustomerYwjl> GetListCustomerYwjl(string CustomerId)
+ {
+ var listUser = _context.CustomerYwjls.Where(u => u.UserId == CustomerId).OrderByDescending(x=>x.Createtime).ToList();
+ return listUser;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1