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/LiaotianService.cs | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/LiaotianService.cs b/zhengcaioa/Services/LiaotianService.cs
index 15f76d7..ed98b8f 100644
--- a/zhengcaioa/Services/LiaotianService.cs
+++ b/zhengcaioa/Services/LiaotianService.cs
@@ -55,6 +55,8 @@
updateliaotian.Problemtype = liaotian.Problemtype;
updateliaotian.Shiyongfatiao = liaotian.Shiyongfatiao;
updateliaotian.ChushuStatus = liaotian.ChushuStatus;
+ updateliaotian.Shenheer = liaotian.Shenheer;
+ updateliaotian.Shenhetime = liaotian.Shenhetime;
}
_context.SaveChanges();
@@ -105,7 +107,28 @@
return sysCodeDtls;
}
+ public List<SysCodeDtl> GetSYScodeshanchu(string code_table, string code_field)
+ {
+
+ List<SysCodeDtl> sysCodeDtls = (from e in _context.SysCodes
+ join c in _context.SysCodeDtls
+ on e.Id equals c.CodeId
+ where e.RecStatus == "A"
+ && c.RecStatus == "D"
+ && e.CodeTable == code_table
+ && e.CodeField == code_field
+ select c).OrderBy(x => x.Sort).ToList();
+
+
+
+
+
+
+
+ return sysCodeDtls;
+ }
+
public ResultDataEntity<LiaotianDTO> SearchByPaging(LiaotianDTOSearch searchEntity)
{
ResultDataEntity<LiaotianDTO> data = new ResultDataEntity<LiaotianDTO>();
@@ -164,6 +187,8 @@
Problemtype = a.Problemtype,
Shiyongfatiao = a.Shiyongfatiao,
ChushuStatus= a.ChushuStatus,
+ Shenheer = a.Shenheer,
+ Shenhetime = a.Shenhetime,
}
)
.Distinct() .OrderByDescending(x => x.Modifytime).ToList();
@@ -179,7 +204,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
//list = _mapper.Map<List<LiaotianDTO>>(lianlist);
@@ -339,5 +364,69 @@
return result;
}
+
+
+
+ public ResultEntity saveSysUpdatetime(SysUpdatetime sysUpdatetime)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ if (String.IsNullOrEmpty(sysUpdatetime.Id))
+ {
+ sysUpdatetime.Id = Guid.NewGuid().ToString();
+ _context.SysUpdatetimes.Add(sysUpdatetime);
+ }
+ else
+ {
+ var updateliaotian = _context.SysUpdatetimes.Find(sysUpdatetime.Id);
+ updateliaotian.Updatename = sysUpdatetime.Updatename;
+ updateliaotian.Updatetime = sysUpdatetime.Updatetime;
+
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = sysUpdatetime.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+ public SysUpdatetime GetSysUpdatetime(string updatename)
+ {
+
+ var entity = _context.SysUpdatetimes.Where(x=>x.Updatename == updatename).FirstOrDefault();
+
+ return entity;
+ }
+
+
+ public List<LiaotianDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.Liaotians.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+ var list = _mapper.Map<List<LiaotianDTO>>(listPosition);
+ return list;
+ }
+
+ public List<LiaotianDTO> GetListsalaryshenhe(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.Liaotians.Where(r => r.RecStatus == "A" && r.Shenheer == userid && r.Shenhetime >= datemin && r.Shenhetime < datemax).ToList();
+
+ var list = _mapper.Map<List<LiaotianDTO>>(listPosition);
+ return list;
+ }
}
}
--
Gitblit v1.9.1