From 0c188ee217146c88ca96d99b5795d1883b733840 Mon Sep 17 00:00:00 2001
From: wx <wx036@qq.com>
Date: 星期五, 30 十二月 2022 12:51:24 +0800
Subject: [PATCH] 排序
---
GasolineBlend.Entity/SysIpcClass.cs | 24 ++++++++++++++++++++++++
Pissa.Service/DbService/SysService.cs | 6 +++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/GasolineBlend.Entity/SysIpcClass.cs b/GasolineBlend.Entity/SysIpcClass.cs
index 117177a..482abda 100644
--- a/GasolineBlend.Entity/SysIpcClass.cs
+++ b/GasolineBlend.Entity/SysIpcClass.cs
@@ -21,6 +21,14 @@
/// 鐖禼ode
/// </summary>
public string ParentCode { get; set; }
+ /// <summary>
+ /// 鎺掑簭鐮�1
+ /// </summary>
+ public int Sort1 { get; set; }
+ /// <summary>
+ /// 鎺掑簭鐮�1
+ /// </summary>
+ public string Sort2 { get; set; }
}
@@ -39,6 +47,14 @@
/// 鐖禼ode
/// </summary>
public string ParentCode { get; set; }
+ /// <summary>
+ /// 鎺掑簭鐮�1
+ /// </summary>
+ public int Sort1 { get; set; }
+ /// <summary>
+ /// 鎺掑簭鐮�1
+ /// </summary>
+ public string Sort2 { get; set; }
}
@@ -57,5 +73,13 @@
/// 鐖禼ode
/// </summary>
public string ParentCode { get; set; }
+ /// <summary>
+ /// 鎺掑簭鐮�1
+ /// </summary>
+ public int Sort1 { get; set; }
+ /// <summary>
+ /// 鎺掑簭鐮�1
+ /// </summary>
+ public string Sort2 { get; set; }
}
}
\ No newline at end of file
diff --git a/Pissa.Service/DbService/SysService.cs b/Pissa.Service/DbService/SysService.cs
index 01e9e65..679a88c 100644
--- a/Pissa.Service/DbService/SysService.cs
+++ b/Pissa.Service/DbService/SysService.cs
@@ -37,7 +37,7 @@
var res = Context.Queryable<SysIpcClass>()
.Where(a => a.Year == year)
.Where(a => a.ParentCode == parentCode)
- .OrderBy(a => a.Code)
+ .OrderBy(a => a.Sort1).OrderBy(a => a.Sort2)
.ToList();
return res;
}
@@ -52,7 +52,7 @@
var res = Context.Queryable<SysCpcClass>()
.Where(a => a.ParentCode == parentCode)
.WhereIF(parentCode.IsNullOrEmpty(), a=>a.Code.Length ==1)
- .OrderBy(a=>a.Code)
+ .OrderBy(a=>a.Sort1).OrderBy(a => a.Sort2)
.ToList();
return res;
}
@@ -122,7 +122,7 @@
/// <returns></returns>
public List<IviewTree> GetLoccn()
{
- var data = Context.Queryable<SysLoccn>().OrderBy(a => a.Code).ToList();
+ var data = Context.Queryable<SysLoccn>().OrderBy(a => a.Sort1).OrderBy(a=>a.Sort2).ToList();
var tree = TreeHelper.GenerateIviewTree(data, a => a.Code,
a => a.ParentCode,
a => a.Code,
--
Gitblit v1.8.0