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/CooperVisitService.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/Services/CooperVisitService.cs b/zhengcaioa/Services/CooperVisitService.cs
index 19f433a..d5c2448 100644
--- a/zhengcaioa/Services/CooperVisitService.cs
+++ b/zhengcaioa/Services/CooperVisitService.cs
@@ -156,12 +156,15 @@
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
+ join zzz in _context.PltUsers.Where(x => x.RecStatus == "A")
+ on a.Creater equals zzz.Id
+ into zsssss
+ from zzzzz in zsssss.DefaultIfEmpty()
where a.RecStatus == "A"
@@ -198,7 +201,7 @@
Jy = a.Jy,
Creater = a.Creater,
Createtime = a.Createtime,
-
+ CreaterName = zzzzz.UserName,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
@@ -247,7 +250,7 @@
/// 鑾峰彇鎵�鏈夋湁鏁堝悎浣滃鎴�
/// </summary>
/// <returns></returns>
- public List<CooperatecustomCustomerDTO> GetList(string[] id)
+ public List<CooperatecustomCustomerDTO> GetList(string[] id=null)
{
List<CooperatecustomCustomerDTO> result = new List<CooperatecustomCustomerDTO>();
if (id != null)
@@ -258,6 +261,12 @@
result = _mapper.Map<List<CooperatecustomCustomerDTO>>(listCooperatecustomCustomers);
}
+ else
+ {
+ var listCooperatecustomCustomers = _context.CooperatecustomCustomers.ToList();
+
+ result = _mapper.Map<List<CooperatecustomCustomerDTO>>(listCooperatecustomCustomers);
+ }
--
Gitblit v1.9.1