From 18db26a9759c18cac8fa3df420ff80d9f0de1ed9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 14 十二月 2021 11:11:42 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/SysCodeService.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/SysCodeService.cs b/zhengcaioa/Services/SysCodeService.cs
index 59459b6..26a81e3 100644
--- a/zhengcaioa/Services/SysCodeService.cs
+++ b/zhengcaioa/Services/SysCodeService.cs
@@ -402,13 +402,18 @@
(string.IsNullOrWhiteSpace(searchEntity.Comments) ? true : a.Comments.Contains(searchEntity.Comments)) &&
(string.IsNullOrWhiteSpace(searchEntity.CodeSn) ? true : a.CodeSn.Contains(searchEntity.CodeSn)) &&
(string.IsNullOrWhiteSpace(searchEntity.Contents) ? true : a.Contents.Contains(searchEntity.Contents)) &&
- (string.IsNullOrWhiteSpace(searchEntity.WentiId) ? true : a.Contents == searchEntity.WentiId)
+ (string.IsNullOrWhiteSpace(searchEntity.WentiId) ? true : a.Contents == searchEntity.WentiId) &&
+ (string.IsNullOrWhiteSpace(searchEntity.Classify1) ? true : a.Classify1.Contains(searchEntity.Classify1))
select a
).OrderBy(x=>x.Sort).ToList();
if (!string.IsNullOrEmpty(searchEntity.Sort))
{
listCode = listCode.OrderBy(x => x.CodeSn).ToList();
+ }
+ else if (!string.IsNullOrEmpty(searchEntity.Sort1))
+ {
+ listCode = listCode.OrderBy(x => x.Classify1).ThenBy(x=>x.CodeSn).ToList();
}
//if (searchEntity.totalrows == 0)
@@ -433,7 +438,7 @@
Comments = l.Comments,
Contents = l.Contents,
Sort = l.Sort,
-
+ Classify1 = l.Classify1,
Creater = l.Creater,
Createtime = l.Createtime,
RecStatus = l.RecStatus,
@@ -473,6 +478,7 @@
alldtl.Createtime = model.Createtime;
alldtl.Modifier = model.Modifier;
alldtl.Modifytime = model.Modifytime;
+ alldtl.Classify1 = model.Classify1;
alldtl.CreatetimeStr = model.Createtime.ToString();
alldtl.RecStatusName = model.RecStatus.ToString().Equals("A") ? "鍚敤" : "鍋滅敤";
}
@@ -533,6 +539,7 @@
mModel.Contents = Entity.Contents + "";
mModel.Sort = Entity.Sort;
mModel.RecStatus = "A";
+ mModel.Classify1 = Entity.Classify1;
mModel.Modifier = Entity.Modifier;
mModel.Modifytime = Entity.Modifytime;
@@ -561,7 +568,8 @@
Creater = Entity.Modifier,
Createtime = Entity.Modifytime,
Modifier = Entity.Modifier,
- Modifytime = Entity.Modifytime
+ Modifytime = Entity.Modifytime,
+ Classify1 = Entity.Classify1,
});
--
Gitblit v1.9.1