From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/Services/UserService.cs | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 9364f63..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;
}
@@ -184,6 +184,13 @@
updatepltUser.miniyearsalary = pltUser.miniyearsalary;
updatepltUser.senioritywages = pltUser.senioritywages;
updatepltUser.Istravelsubsidy = pltUser.Istravelsubsidy;
+ updatepltUser.Beizhu = pltUser.Beizhu;
+ updatepltUser.baomisalary = pltUser.baomisalary;
+ updatepltUser.jibensalary = pltUser.jibensalary;
+ updatepltUser.jintiesalary = pltUser.jintiesalary;
+ updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
+ updatepltUser.Yaoqingma = pltUser.Yaoqingma;
+ updatepltUser.HetongDateEnd = pltUser.HetongDateEnd;
}
_context.SaveChanges();
@@ -261,7 +268,10 @@
into fsssss
from fff in fsssss.DefaultIfEmpty()
-
+ join h in listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou")
+ on a.Istravelsubsidy equals h.CodeSn
+ into hsssss
+ from hhh in hsssss.DefaultIfEmpty()
where a.RecStatus == "A"
@@ -276,6 +286,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Phone) || a.Phone.Contains(searchEntity.Phone.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.Zhiwustatus) || a.Zhiwustatus == searchEntity.Zhiwustatus.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Usernumber) || a.Usernumber == searchEntity.Usernumber.Trim())
//select a
select new PltUserDTO
{
@@ -294,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") : "",
@@ -304,9 +317,31 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
UserSn = a.UserSn,
- Coler = (a.IsQdht!="A"?"red":((!a.Shebaodate.HasValue) && (a.IsGmsb != "D")? "Darkorange" : ""))
+ Coler = (a.IsQdht!="A"?"red":((!a.Shebaodate.HasValue) && (a.IsGmsb != "D")? "Darkorange" : "")),
+ IpMac = a.IpMac,
+ Iswdenter = a.Iswdenter,
+ Isxmenter = a.Isxmenter,
+ Usernumber = a.Usernumber,
+ advancewages = a.advancewages,
+ miniyearsalary = a.miniyearsalary,
+ senioritywages = a.senioritywages,
+ Istravelsubsidy = a.Istravelsubsidy,
+ Beizhu = a.Beizhu,
+ IstravelsubsidyName = hhh.Comments,
+ advancewagesName = a.advancewages.HasValue ? a.advancewages.Value.ToString("F2") : "",
+ miniyearsalaryName = a.miniyearsalary.HasValue ? a.miniyearsalary.Value.ToString("F2") : "",
+ senioritywagesName = a.senioritywages.HasValue ? a.senioritywages.Value.ToString("F2") : "",
+ jibensalary = a.jibensalary,
+ baomisalary = a.baomisalary,
+ jintiesalary = a.jintiesalary,
+ jibensalaryName = a.jibensalary.HasValue ? a.jibensalary.Value.ToString("F2") : "",
+ baomisalaryName = a.baomisalary.HasValue ? a.baomisalary.Value.ToString("F2") : "",
+ 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.UserSn).ToList();
+ ).OrderBy(x => x.Usernumber).ToList();
@@ -316,7 +351,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);
@@ -362,6 +397,81 @@
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;
+ }
+
+
+ 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