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/FiAccountService.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/FiAccountService.cs b/zhengcaioa/Services/FiAccountService.cs
index 2a9502a..0aea685 100644
--- a/zhengcaioa/Services/FiAccountService.cs
+++ b/zhengcaioa/Services/FiAccountService.cs
@@ -142,10 +142,15 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.AllIncome) ?? 0, 2);
+ data.Heji2 = Math.Round(query.Sum(x => x.AllExpenses ?? 0), 2);
+ data.Heji3 = Math.Round(query.Sum(x => x.Balance ?? 0), 2);
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
-
+ data.DangyeHeji1 = Math.Round(rolelist.Sum(x => x.AllIncome) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(rolelist.Sum(x => x.AllExpenses ?? 0), 2);
+ data.DangyeHeji3 = Math.Round(rolelist.Sum(x => x.Balance ?? 0), 2);
data.LoadData(searchEntity, rolelist);
return data;
}
--
Gitblit v1.9.1