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/AdmPieceCheckService.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index d6f3fca..1696c5d 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/zhengcaioa/Services/AdmPieceCheckService.cs
@@ -47,7 +47,7 @@
updateproject.WorkPro = entity.WorkPro;
updateproject.Remark = entity.Remark;
updateproject.Gongzi = entity.Gongzi;
-
+ updateproject.Shuliang = entity.Shuliang;
updateproject.Remark = entity.Remark;
updateproject.RecStatus = entity.RecStatus;
@@ -130,7 +130,7 @@
- join k in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
+ join k in _context.PltUsers.Where(x => x.RecStatus == "A")
on a.UserId equals k.Id
into ksssss
from kkk in ksssss.DefaultIfEmpty()
@@ -184,7 +184,7 @@
WorkProName = ccc.Project,
Gongzi = a.Gongzi ?? 0,
Remark = a.Remark,
-
+ Shuliang = a.Shuliang ?? 0,
Creater = a.Creater,
Createtime = a.Createtime,
@@ -197,9 +197,13 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.Gongzi) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.Shuliang ?? 0), 2);
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Gongzi) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shuliang ?? 0), 2);
data.LoadData(searchEntity, lianlist);
return data;
}
--
Gitblit v1.9.1