From 0c7b13e91cd472e21e4a620355e6fcabc11f695a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 一月 2022 13:56:24 +0800
Subject: [PATCH] 计件登记，汇总，打印
---
zhengcaioa/Services/FiAccountRecordService.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index 3c209b2..e2e5487 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,
@@ -169,7 +170,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -200,12 +201,17 @@
/// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
/// </summary>
/// <returns></returns>
- public List<FiAccountRecordDTO> GetList()
+ public List<FiAccountRecordDTO> GetList(string OperationalMatters = null)
{
var listPosition = _context.FiAccountRecords.Where(r => r.RecStatus == "A" ).ToList();
+ if (!string.IsNullOrEmpty(OperationalMatters))
+ {
+ listPosition = listPosition.Where(x => x.OperationalMatters == OperationalMatters).ToList();
+ }
+
var list = _mapper.Map<List<FiAccountRecordDTO>>(listPosition);
return list;
}
--
Gitblit v1.9.1