From 94d0b18fa47a92a1cb4d1fef4520d35ef2c2c322 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期二, 16 十二月 2025 21:56:49 +0800
Subject: [PATCH] 产能排产相关后端更新
---
WebApi/Gs.Sys/Services/OrganizationController.cs | 46 +++++++++++++++++-----------------------------
1 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/OrganizationController.cs b/WebApi/Gs.Sys/Services/OrganizationController.cs
index f8cd091..cdfca2f 100644
--- a/WebApi/Gs.Sys/Services/OrganizationController.cs
+++ b/WebApi/Gs.Sys/Services/OrganizationController.cs
@@ -38,7 +38,7 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<PageList<SysOrganization>> GetListPage(PageQuery query)
{
- var keyWord = query.keyWord;
+ string keyWord = query.keyWord;
var pageList = new PageList<SysOrganization>();
try
{
@@ -55,22 +55,20 @@
query.everyPageSize);
if (!string.IsNullOrEmpty(keyWord))
{
- var sbOrg = new StringBuilder();
- var dataSet = new DataSet();
- dataSet = DbHelperSQL.Query(
- " select org_fid from [dbo].[SYS_USER_ORG] where user_guid='" +
- keyWord + "' order by org_fid asc");
+ System.Text.StringBuilder sbOrg = new StringBuilder();
+ System.Data.DataSet dataSet = new System.Data.DataSet();
+ dataSet = Gs.Toolbox.DbHelperSQL.Query(" select org_fid from [dbo].[SYS_USER_ORG] where user_guid='" + keyWord + "' order by org_fid asc");
if (dataSet != null && dataSet.Tables.Count > 0)
+ {
foreach (DataRow _row in dataSet.Tables[0].Rows)
{
if (sbOrg.Length > 0)
sbOrg.Append(", ");
- sbOrg.Append(_row["org_fid"]);
+ sbOrg.Append(_row["org_fid"].ToString());
}
-
+ }
pageList.extendText = sbOrg.ToString();
}
-
return ReturnDto<PageList<SysOrganization>>.QuickReturn(pageList,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -91,32 +89,25 @@
{
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
- var sortName = string.IsNullOrEmpty(model.sortName)
- ? "a.FNumber"
- : model.sortName;
+ var sortName = string.IsNullOrEmpty(model.sortName) ? "a.FNumber" : model.sortName;
var keyWhere = model.keyWhere;
- var keyType = model.keyType;
+ string keyType = model.keyType;
var sbSql = new StringBuilder();
sbSql.Append("select * from ");
sbSql.Append("( ");
- sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
- sortName + " " + model.sortOrder + ") as rowIndex,a.* ");
+ sbSql.Append("select top 100000 ROW_NUMBER() over(order by " + sortName + " " + model.sortOrder + ") as rowIndex,a.* ");
if (string.IsNullOrEmpty(keyType))
+ {
sbSql.Append(",cast(0 as bit) as chkInt");
+ }
else
- sbSql.Append(
- ",cast( (select count(1) from SYS_USER_BIND b where b.userGuid='" +
- keyType +
- "' and b.aboutGuid=cast( a.FID as nvarchar(50)) and b.fType='缁勭粐') as bit) as chkInt ");
+ sbSql.Append(",cast( (select count(1) from SYS_USER_BIND b where b.userGuid='" + keyType + "' and b.aboutGuid=cast( a.FID as nvarchar(50)) and b.fType='缁勭粐') as bit) as chkInt ");
sbSql.Append(" from SYS_ORGANIZATION a ");
sbSql.Append(keyWhere);
sbSql.Append(") as T ");
- sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
- everyPageSize + " and T.rowindex<=" + currentPage + "*" +
- everyPageSize);
+ sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" + everyPageSize + " and T.rowindex<=" + currentPage + "*" + everyPageSize);
sbSql.Append(" order by rowindex asc ");
- sbSql.Append(
- " select count(1) as intTotal from SYS_ORGANIZATION a where 1=1 ");
+ sbSql.Append(" select count(1) as intTotal from SYS_ORGANIZATION a where 1=1 ");
sbSql.Append(keyWhere);
var dset = new DataSet();
try
@@ -126,8 +117,7 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "GetListPage2 error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(
- default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
var _pglist = new PageList<dynamic>
@@ -140,8 +130,7 @@
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
var pages = intTotal % everyPageSize != 0
? intTotal / everyPageSize + 1
: intTotal / everyPageSize;
@@ -151,7 +140,6 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
--
Gitblit v1.9.3