From ea037964dba48654bdaf7169517c64508984841e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 19 七月 2021 14:53:45 +0800
Subject: [PATCH] 今日开发： 工作考评 按部门排序。不显示离职员工 工作统计，去掉标题 所有查询，只选择开始或者结束日期，自动补充另外一个日期 工作统计增加根据日期查询，只显示有数据的项 增加全员工作统计菜单，可以查询每个每个在职员工的工作统计
---
zhengcaioa/Services/FiAccountRecordService.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index a57992c..2c9013b 100644
--- a/zhengcaioa/Services/FiAccountRecordService.cs
+++ b/zhengcaioa/Services/FiAccountRecordService.cs
@@ -132,7 +132,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.PaymentUnit) || a.PaymentUnit.Contains(searchEntity.PaymentUnit.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.CreaterName) || y.UserName.Contains(searchEntity.CreaterName.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
-
+ && (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
+
select new FiAccountRecordDTO
{
Id = a.Id,
@@ -159,6 +160,7 @@
QiyongStatus = a.QiyongStatus,
RecStatus = a.RecStatus,
Balance = z.Balance??0,
+ AccountMoney = a.AccountMoney??0,
}).OrderByDescending(x => x.Modifytime).ToList();
--
Gitblit v1.9.1