From d14b82fec13361486c49165371b5dee1b7089c09 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 十二月 2021 13:35:23 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/SysCodeService.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/Services/SysCodeService.cs b/zhengcaioa/Services/SysCodeService.cs
index 527653b..73baf70 100644
--- a/zhengcaioa/Services/SysCodeService.cs
+++ b/zhengcaioa/Services/SysCodeService.cs
@@ -33,11 +33,11 @@
(searchEntity.Comments == "" ? true : s.Comments.Contains(searchEntity.Comments)) &&
(searchEntity.RecStatus == "" ? s.RecStatus == "A" : s.RecStatus == searchEntity.RecStatus)
).ToList();
- if (searchEntity.totalrows == 0)
- {
+ //if (searchEntity.totalrows == 0)
+ //{
//鑾峰彇鎬绘暟
searchEntity.totalrows = listCode.Count;
- }
+ //}
var list = listCode.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
var listSysCode = new List<SysCodeEntity>();
if (list.Count > 0)
@@ -402,15 +402,21 @@
(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 (searchEntity.totalrows == 0)
+ if (!string.IsNullOrEmpty(searchEntity.Sort))
{
+ listCode = listCode.OrderBy(x => x.CodeSn).ToList();
+ }
+
+ //if (searchEntity.totalrows == 0)
+ //{
//鑾峰彇鎬绘暟
searchEntity.totalrows = listCode.Count;
- }
+ //}
var list = listCode.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
var listSysCode = new List<SysCodeDtlEntity>();
@@ -428,7 +434,7 @@
Comments = l.Comments,
Contents = l.Contents,
Sort = l.Sort,
-
+ Classify1 = l.Classify1,
Creater = l.Creater,
Createtime = l.Createtime,
RecStatus = l.RecStatus,
@@ -468,6 +474,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") ? "鍚敤" : "鍋滅敤";
}
@@ -504,6 +511,17 @@
resultEntity.Result = true;
try
{
+ if (!string.IsNullOrEmpty(Entity.CodeSn))
+ {
+ var list = _context.SysCodeDtls.Where(e => e.CodeSn == Entity.CodeSn && e.RecStatus == "A" && e.Id != Entity.Id && e.CodeId == Entity.CodeId).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ョ紪鐮佸凡缁忓瓨鍦�";
+ return resultEntity;
+ }
+ }
+
if (!string.IsNullOrEmpty(Entity.Id))
{
@@ -517,6 +535,7 @@
mModel.Contents = Entity.Contents + "";
mModel.Sort = Entity.Sort;
mModel.RecStatus = "A";
+ mModel.Classify1 = Entity.Classify1;
mModel.Modifier = Entity.Modifier;
mModel.Modifytime = Entity.Modifytime;
@@ -545,7 +564,8 @@
Creater = Entity.Modifier,
Createtime = Entity.Modifytime,
Modifier = Entity.Modifier,
- Modifytime = Entity.Modifytime
+ Modifytime = Entity.Modifytime,
+ Classify1 = Entity.Classify1,
});
--
Gitblit v1.9.1