From e649be7905be7e74f6e09d8d74a7bd7bcd3923b7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 16:17:35 +0800
Subject: [PATCH] 修改
---
zhengcaioa/Services/LiaotianService.cs | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/LiaotianService.cs b/zhengcaioa/Services/LiaotianService.cs
index fac8a6b..6ddb2bb 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();
@@ -120,14 +122,23 @@
DateTime.TryParse(Createtimes[1], out Createtimeend);
Createtimeend = Createtimeend.AddDays(1);
}
+
+
+
+ //var query1 = _context.Liaotians.Where(a => a.RecStatus == "A");
+
+
+
+
+
//绛涢��
var query = (from a in _context.Liaotians
- join h in _context.LiaotianShoucangs.Where(x => x.RecStatus == "A" && x.Creater == searchEntity.ShouCangCreater)
- on a.Id equals h.LiaotianId
- into hsss
- from hhh in hsss.DefaultIfEmpty()
+ // join h in _context.LiaotianShoucangs.Where(x => x.RecStatus == "A" && x.Creater == searchEntity.ShouCangCreater)
+ // on a.Id equals h.LiaotianId
+ //into hsss
+ // from hhh in hsss.DefaultIfEmpty()
where a.RecStatus == "A"
@@ -139,7 +150,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Shifoushenhe) || (a.Clientid == searchEntity.Shifoushenhe.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.ChushuStatus) || (a.ChushuStatus == searchEntity.ChushuStatus.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.Creater) || (a.Creater == searchEntity.Creater.Trim()))
- && (string.IsNullOrWhiteSpace(searchEntity.ShouCangStatus) || (searchEntity.ShouCangStatus == "A" && hhh.Id !=null) || (searchEntity.ShouCangStatus != "A" && hhh.Id == null))
+ //&& (string.IsNullOrWhiteSpace(searchEntity.ShouCangStatus) || (searchEntity.ShouCangStatus == "A" && hhh.Id !=null) || (searchEntity.ShouCangStatus != "A" && hhh.Id == null))
select new LiaotianDTO
{
Id = a.Id,
@@ -155,6 +166,8 @@
Problemtype = a.Problemtype,
Shiyongfatiao = a.Shiyongfatiao,
ChushuStatus= a.ChushuStatus,
+ Shenheer = a.Shenheer,
+ Shenhetime = a.Shenhetime,
}
)
.Distinct() .OrderByDescending(x => x.Modifytime).ToList();
@@ -170,11 +183,11 @@
- 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);
- data.LoadData(searchEntity, query);
+ data.LoadData(searchEntity, lianlist);
return data;
}
@@ -330,5 +343,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