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/WfNeeddeelService.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/WfNeeddeelService.cs b/zhengcaioa/Services/WfNeeddeelService.cs
index ee0563f..30f0f34 100644
--- a/zhengcaioa/Services/WfNeeddeelService.cs
+++ b/zhengcaioa/Services/WfNeeddeelService.cs
@@ -143,6 +143,8 @@
join d in _context.WfApplytypes
on k.Applytiye equals d.Applyno
+ into dsssss
+ from ddd in dsssss.DefaultIfEmpty()
join b in _context.PltUsers
on k.Creater equals b.Id
@@ -185,7 +187,7 @@
Applyno = k.Applyno,
CreaterName = b.UserName,
DeptName = c.DeptName,
- Applytiye = d.Applytiye,
+ Applytiye = ddd.Applytiye,
Content = k.Content,
ShenpiStatusName = eee.Comments,
Resivetime = a.Resivetime,
@@ -202,11 +204,11 @@
Modifytime = a.Modifytime,
}
- ).OrderBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
+ ).OrderByDescending(x=>x.Applyno).ThenBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
- 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);
--
Gitblit v1.9.1