From 7b9e068cfe4e295f9ee960457d848c631f0136c7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 八月 2021 16:09:56 +0800
Subject: [PATCH] 工作交接
---
zhengcaioa/Services/CooperVisitService.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/Services/CooperVisitService.cs b/zhengcaioa/Services/CooperVisitService.cs
index 6ecfc8c..19f433a 100644
--- a/zhengcaioa/Services/CooperVisitService.cs
+++ b/zhengcaioa/Services/CooperVisitService.cs
@@ -130,20 +130,36 @@
var query = (from a in _context.CooperVisits
join b in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "visType")
- on a.VisType equals b.CodeSn
+ on a.VisType equals b.CodeSn
+ into bzsssss
+ from bzzzzz in bzsssss.DefaultIfEmpty()
+
join c in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
on a.Jtype equals c.CodeSn
+ into czsssss
+ from czzzzz in czsssss.DefaultIfEmpty()
+
join d in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "zw")
on a.Zw equals d.CodeSn
+ into dzsssss
+ from dzzzzz in dzsssss.DefaultIfEmpty()
+
join e in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "yx")
on a.Yx equals e.CodeSn
+ into ezsssss
+ from ezzzzz in ezsssss.DefaultIfEmpty()
+
join f in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jy")
on a.Jy equals f.CodeSn
- join zz in _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A")
+ into fzsssss
+ from fzzzzz in fzsssss.DefaultIfEmpty()
+
+ join zz in _context.CooperatecustomCustomers
on a.Viscustomer equals zz.Id
- join g in _context.Areas on zz.Sheng equals g.CodeId
- join h in _context.Areas on zz.City equals h.CodeId
- join i in _context.Areas on zz.AreaId equals i.CodeId
+
+ //join g in _context.Areas on zz.Sheng equals g.CodeId
+ //join h in _context.Areas on zz.City equals h.CodeId
+ //join i in _context.Areas on zz.AreaId equals i.CodeId
@@ -158,7 +174,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Sheng) || zz.Sheng == searchEntity.Sheng.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.City) || zz.City == searchEntity.City.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zz.AreaId == searchEntity.AreaId.Trim())
-
+ && (string.IsNullOrWhiteSpace(searchEntity.Viscustomer) || a.Viscustomer == searchEntity.Viscustomer.Trim())
select new CooperVisitDTO
{
Id = a.Id,
@@ -168,12 +184,12 @@
Name = zz.Name,
Jtype = a.Jtype,
Jdr = a.Jdr,
- ShengName = g.Name + "-" + h.Name + "-" + i.Name,
- VisTypeName = b.Comments,
- JtypeName = c.Comments,
- ZwName = d.Comments,
- YxName = e.Comments,
- JyName = f.Comments,
+ //ShengName = g.Name + "-" + h.Name + "-" + i.Name,
+ VisTypeName = bzzzzz.Comments,
+ JtypeName = czzzzz.Comments,
+ ZwName = dzzzzz.Comments,
+ YxName = ezzzzz.Comments,
+ JyName = fzzzzz.Comments,
Zw = a.Zw,
Talk = a.Talk,
Khfk = a.Khfk,
@@ -192,7 +208,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();
data.LoadData(searchEntity, lianlist);
@@ -248,5 +264,22 @@
return result;
}
+
+ public List<CooperVisitDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ // var listCooperVisits = _context.CooperVisits.Where(r => id.Contains(r.Id) && r.RecStatus == "A").Select(x => x.Viscustomer).ToList();
+
+ var listCooperatecustomCustomers = _context.CooperVisits.Where(r => r.RecStatus == "A"&& r.Creater == userid && r.Vistime >= datemin && r.Vistime < datemax).ToList();
+
+ var result = _mapper.Map<List<CooperVisitDTO>>(listCooperatecustomCustomers);
+
+
+
+
+
+ return result;
+ }
}
}
--
Gitblit v1.9.1