From aebd2d642e19ce9ccb253c671b239e7ed9fc91c6 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 10 九月 2025 16:11:12 +0800
Subject: [PATCH] 代码修改为七喜
---
WebApi/Gs.JJGZ/MesJjgzScheduleController.cs | 95 +++++++++++++++++++----------------------------
1 files changed, 38 insertions(+), 57 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs b/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs
index 85d484c..c1709d9 100644
--- a/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs
+++ b/WebApi/Gs.JJGZ/MesJjgzScheduleController.cs
@@ -1,6 +1,7 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using System.Dynamic;
+using System.Text;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
@@ -17,7 +18,6 @@
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
-
public MesJjgzScheduleController(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -38,7 +38,7 @@
int everyPageSize = model.everyPageSize;
string sortName = model.sortName;
string keyWhere = model.keyWhere;
-
+
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -49,32 +49,27 @@
try
{
// 鏋勫缓鍒嗛〉鏌ヨSQL
- var orderBy = string.IsNullOrEmpty(sortName)
- ? "CREATE_DATE DESC"
- : $"{sortName} ASC";
-
+ string orderBy = string.IsNullOrEmpty(sortName) ? "CREATE_DATE DESC" : $"{sortName} ASC";
+
// 鏌ヨ鎬绘暟
- var countSql =
- $"SELECT COUNT(1) FROM MES_JJGZ_SCHEDULES WHERE 1=1 {keyWhere}";
+ string countSql = $"SELECT COUNT(1) FROM MES_JJGZ_SCHEDULES WHERE 1=1 {keyWhere}";
var countResult = DbHelperSQL.GetSingle(countSql);
- var intTotal =
- countResult != null ? Convert.ToInt32(countResult) : 0;
-
+ int intTotal = countResult != null ? Convert.ToInt32(countResult) : 0;
+
if (intTotal > 0)
{
// 鍒嗛〉鏌ヨ鏁版嵁
- var offset = (currentPage - 1) * everyPageSize;
- var dataSql = $@"
+ int offset = (currentPage - 1) * everyPageSize;
+ string dataSql = $@"
SELECT * FROM (
SELECT ROW_NUMBER() OVER (ORDER BY {orderBy}) AS RowNum, *
FROM MES_JJGZ_SCHEDULES
WHERE 1=1 {keyWhere}
) AS T
WHERE T.RowNum BETWEEN {offset + 1} AND {offset + everyPageSize}";
-
+
var dsMain = DbHelperSQL.Query(dataSql);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var pages = intTotal % everyPageSize != 0
? intTotal / everyPageSize + 1
@@ -91,9 +86,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
+ ReturnCode.Exception, ex.Message);
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -108,13 +102,12 @@
{
string guid = model.guid.ToString();
dynamic m = new ExpandoObject();
- var mainTable = "MES_JJGZ_SCHEDULES";
+ string mainTable = "MES_JJGZ_SCHEDULES";
try
{
- var sqlMain = $"SELECT * FROM {mainTable} WHERE GUID='{guid}'";
+ string sqlMain = $"SELECT * FROM {mainTable} WHERE GUID='{guid}'";
var dsMain = DbHelperSQL.Query(sqlMain);
- if (dsMain != null && dsMain.Tables.Count > 0 &&
- dsMain.Tables[0].Rows.Count > 0)
+ if (dsMain != null && dsMain.Tables.Count > 0 && dsMain.Tables[0].Rows.Count > 0)
{
var dr = dsMain.Tables[0].Rows[0];
m = dr.RowToDynamic();
@@ -124,10 +117,8 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
}
@@ -146,9 +137,8 @@
m.outMsg = "";
try
{
- var sql =
- $"UPDATE MES_JJGZ_SCHEDULES SET CHECK_STATUS='{_inFieldValue}',CHECK_DATE = getdate(), CHECK_USER='{_userGuid}' WHERE GUID='{_guid}'";
- var rows = DbHelperSQL.ExecuteSql(sql);
+ string sql = $"UPDATE MES_JJGZ_SCHEDULES SET CHECK_STATUS='{_inFieldValue}',CHECK_DATE = getdate(), CHECK_USER='{_userGuid}' WHERE GUID='{_guid}'";
+ int rows = DbHelperSQL.ExecuteSql(sql);
m.outSum = rows;
m.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
}
@@ -157,10 +147,8 @@
LogHelper.Debug(ToString(), "EditModelSubmit error锛�" + ex.Message);
m.outMsg = ex.Message;
m.outSum = -1;
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
@@ -188,17 +176,17 @@
mObj.outSum = -1;
mObj.outGuid = "";
mObj.outNo = "";
-
+
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
try
{
conn.Open();
-
+
if (CheckGuid(guid))
{
// 缂栬緫妯″紡
- var sql = $@"UPDATE MES_JJGZ_SCHEDULES SET
+ string sql = $@"UPDATE MES_JJGZ_SCHEDULES SET
OnWorkTime1='{onWorkTime1}',
OffWorkTime1='{offWorkTime1}',
OnWorkTime2='{onWorkTime2}',
@@ -209,8 +197,8 @@
EndTime='{endTime}',
Remark='{remark}'
WHERE GUID='{guid}'";
-
- var rows = DbHelperSQL.ExecuteSql(sql);
+
+ int rows = DbHelperSQL.ExecuteSql(sql);
mObj.outSum = rows;
mObj.outGuid = guid.ToString();
mObj.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
@@ -219,22 +207,19 @@
{
// 鏂板妯″紡 - 鐢熸垚鐝缂栧彿鍜孏UID
guid = Guid.NewGuid();
-
+
// 璋冪敤瀛樺偍杩囩▼鐢熸垚鐝缂栧彿
using (var cmd = new SqlCommand("getOrderNo", conn))
{
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add(
- new SqlParameter("@wntype", "SC(鐝)"));
- cmd.Parameters.Add(
- new SqlParameter("@hNo", SqlDbType.NVarChar, 50)
- { Direction = ParameterDirection.Output });
-
+ cmd.Parameters.Add(new SqlParameter("@wntype", "SC(鐝)"));
+ cmd.Parameters.Add(new SqlParameter("@hNo", SqlDbType.NVarChar, 50) { Direction = ParameterDirection.Output });
+
cmd.ExecuteNonQuery();
- var scheNo = cmd.Parameters["@hNo"].Value.ToString();
-
+ string scheNo = cmd.Parameters["@hNo"].Value.ToString();
+
// 鎻掑叆鏁版嵁
- var insertSql = $@"
+ string insertSql = $@"
DECLARE @userBy NVARCHAR(20);
SELECT TOP 1 @userBy=[ACCOUNT] FROM [dbo].[SYS_USER] WHERE guid='{_userGuid}';
INSERT INTO MES_JJGZ_SCHEDULES (
@@ -246,8 +231,8 @@
'{onWorkTime1}', '{offWorkTime1}', '{onWorkTime2}', '{offWorkTime2}',
'{onWorkTime3}', '{offWorkTime3}', '{beginTime}', '{endTime}', '{remark}', 0
)";
-
- var rows = DbHelperSQL.ExecuteSql(insertSql);
+
+ int rows = DbHelperSQL.ExecuteSql(insertSql);
mObj.outSum = rows;
mObj.outGuid = guid.ToString();
mObj.outNo = scheNo;
@@ -266,12 +251,10 @@
conn.Close();
}
}
-
+
if (mObj.outSum <= 0)
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception,
- mObj.outMsg);
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success,
- mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
}
/// <summary>
@@ -290,7 +273,7 @@
{
if (CheckGuid(guid))
{
- var sql = $"DELETE FROM MES_JJGZ_SCHEDULES WHERE GUID='{guid}'";
+ string sql = $"DELETE FROM MES_JJGZ_SCHEDULES WHERE GUID='{guid}'";
_outSum = DbHelperSQL.ExecuteSql(sql);
_outMsg = _outSum > 0 ? "鍒犻櫎鎴愬姛锛�" : "鏈垹闄や换浣曟暟鎹�";
}
@@ -306,10 +289,8 @@
_outMsg = ex.Message;
_outSum = -1;
}
-
if (_outSum <= 0)
- return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- _outMsg);
+ return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, _outMsg);
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
}
}
\ No newline at end of file
--
Gitblit v1.9.3