From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.JJGZ/MesJjgzJjsalaryController.cs | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesJjgzJjsalaryController.cs b/WebApi/Gs.JJGZ/MesJjgzJjsalaryController.cs
index 87b0485..4dbf985 100644
--- a/WebApi/Gs.JJGZ/MesJjgzJjsalaryController.cs
+++ b/WebApi/Gs.JJGZ/MesJjgzJjsalaryController.cs
@@ -1,7 +1,6 @@
锘縰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;
@@ -60,7 +59,8 @@
};
try
{
- dset = DbHelperSQL.RunProcedure("prc_JJSALARY_lst", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("prc_JJSALARY_lst", parameters,
+ "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
@@ -82,6 +82,7 @@
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Exception, ex.Message);
}
+
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -98,12 +99,14 @@
dynamic m = new ExpandoObject();
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
- string mainTable = "MES_JJGZ_JJSALARY";
+ var mainTable = "MES_JJGZ_JJSALARY";
try
{
- string sqlMain = $"SELECT A.*,b.item_no,b.item_name,b.item_model FROM {mainTable} A LEFT JOIN MES_ITEMS b on a.ItemId = b.id WHERE a.guid='{guid}'";
+ var sqlMain =
+ $"SELECT A.*,b.item_no,b.item_name,b.item_model FROM {mainTable} A LEFT JOIN MES_ITEMS b on a.ItemId = b.id WHERE a.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();
@@ -113,8 +116,10 @@
{
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, "璇诲彇澶辫触锛�");
}
@@ -133,8 +138,9 @@
m.outMsg = "";
try
{
- string sql = $"UPDATE MES_JJGZ_JJSALARY SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
- int rows = DbHelperSQL.ExecuteSql(sql);
+ var sql =
+ $"UPDATE MES_JJGZ_JJSALARY SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
+ var rows = DbHelperSQL.ExecuteSql(sql);
m.outSum = rows;
m.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
}
@@ -143,8 +149,10 @@
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, "鎿嶄綔鎴愬姛锛�");
}
@@ -173,15 +181,18 @@
string sql;
if (CheckGuid(guid))
{
- sql = $"UPDATE MES_JJGZ_JJSALARY SET ItemId='{itemId}', SALARY={salary}, Remark='{remark}', BeginTime='{beginTime}', EndTime='{endTime}' WHERE guid='{guid}'";
+ sql =
+ $"UPDATE MES_JJGZ_JJSALARY SET ItemId='{itemId}', SALARY={salary}, Remark='{remark}', BeginTime='{beginTime}', EndTime='{endTime}' WHERE guid='{guid}'";
}
else
{
guid = Guid.NewGuid();
- sql = $" declare @userBy nvarchar(20); select top 1 @userBy=[ACCOUNT] from [dbo].[SYS_USER] where guid='{_userGuid}' " +
+ sql =
+ $" declare @userBy nvarchar(20); select top 1 @userBy=[ACCOUNT] from [dbo].[SYS_USER] where guid='{_userGuid}' " +
$"INSERT INTO MES_JJGZ_JJSALARY (guid, CREATE_BY, CREATE_DATE, ItemId, SALARY, Remark, BeginTime, EndTime) VALUES ('{guid}',@userBy,GETDATE(), '{itemId}', {salary}, '{remark}', '{beginTime}', '{endTime}' )";
}
- int rows = DbHelperSQL.ExecuteSql(sql);
+
+ var rows = DbHelperSQL.ExecuteSql(sql);
mObj.outSum = rows;
mObj.outGuid = guid.ToString();
mObj.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
@@ -192,9 +203,12 @@
mObj.outMsg = ex.Message;
mObj.outSum = -1;
}
+
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>
@@ -213,7 +227,7 @@
{
if (CheckGuid(guid))
{
- string sql = $"DELETE FROM MES_JJGZ_JJSALARY WHERE guid='{guid}'";
+ var sql = $"DELETE FROM MES_JJGZ_JJSALARY WHERE guid='{guid}'";
_outSum = DbHelperSQL.ExecuteSql(sql);
_outMsg = _outSum > 0 ? "鍒犻櫎鎴愬姛锛�" : "鏈垹闄や换浣曟暟鎹�";
}
@@ -229,8 +243,10 @@
_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