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/MesJjgzJssalaryController.cs | 62 +++++++++++--------------------
1 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs b/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs
index 902387f..7928a26 100644
--- a/WebApi/Gs.JJGZ/MesJjgzJssalaryController.cs
+++ b/WebApi/Gs.JJGZ/MesJjgzJssalaryController.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 MesJjgzJssalaryController(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
@@ -61,8 +61,7 @@
};
try
{
- dset = DbHelperSQL.RunProcedure("prc_JSSALARY_lst", parameters,
- "0");
+ dset = DbHelperSQL.RunProcedure("prc_JSSALARY_lst", parameters, "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
@@ -82,9 +81,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, "璇诲彇鎴愬姛");
}
@@ -102,13 +100,12 @@
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
// 鍋囪涓昏〃涓篗ES_JJGZ_JS_SALARY锛屾槑缁嗚〃涓篗ES_JJGZ_JS_SALARY_DETAIL
- var mainTable = "MES_JJGZ_JSSALARY";
+ string mainTable = "MES_JJGZ_JSSALARY";
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();
@@ -118,10 +115,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, "璇诲彇澶辫触锛�");
}
@@ -141,9 +136,8 @@
try
{
// 鍋囪鎻愪氦灏辨槸鏇存柊鏌愪釜瀛楁
- var sql =
- $"UPDATE MES_JJGZ_JSSALARY SET check_status='{_inFieldValue}',check_date = getdate(), check_user='{_userGuid}' WHERE guid='{_guid}'";
- var rows = DbHelperSQL.ExecuteSql(sql);
+ string sql = $"UPDATE MES_JJGZ_JSSALARY 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 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
}
@@ -152,10 +146,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, "鎿嶄綔鎴愬姛锛�");
}
@@ -185,18 +177,15 @@
string sql;
if (CheckGuid(guid))
{
- sql =
- $"UPDATE MES_JJGZ_JSSALARY SET HourlyType='{hourlyType}', HourlySalary='{hourlySalary}', Remark='{remark}', SalaryType='{salaryType}', BeginTime='{beginTime}', EndTime='{endTime}' WHERE guid='{guid}'";
+ sql = $"UPDATE MES_JJGZ_JSSALARY SET HourlyType='{hourlyType}', HourlySalary='{hourlySalary}', Remark='{remark}', SalaryType='{salaryType}', 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_JSSALARY (guid, CREATE_BY, CREATE_DATE, HourlyType, HourlySalary, Remark, SalaryType, BeginTime, EndTime) VALUES ('{guid}',@userBy,GETDATE(), '{hourlyType}', '{hourlySalary}', '{remark}', '{salaryType}', '{beginTime}', '{endTime}' )";
}
-
- var rows = DbHelperSQL.ExecuteSql(sql);
+ int rows = DbHelperSQL.ExecuteSql(sql);
mObj.outSum = rows;
mObj.outGuid = guid.ToString();
mObj.outMsg = rows > 0 ? "鎿嶄綔鎴愬姛锛�" : "鏈洿鏂颁换浣曟暟鎹�";
@@ -207,12 +196,9 @@
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>
@@ -232,7 +218,7 @@
{
if (CheckGuid(guid))
{
- var sql = $"DELETE FROM MES_JJGZ_JSSALARY WHERE guid='{guid}'";
+ string sql = $"DELETE FROM MES_JJGZ_JSSALARY WHERE guid='{guid}'";
_outSum = DbHelperSQL.ExecuteSql(sql);
_outMsg = _outSum > 0 ? "鍒犻櫎鎴愬姛锛�" : "鏈垹闄や换浣曟暟鎹�";
}
@@ -248,10 +234,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);
}
@@ -264,13 +248,12 @@
public ReturnDto<ExpandoObject> GetTimeType([FromBody] dynamic model)
{
dynamic m = new ExpandoObject();
- var mainTable = "MES_JJGZ_TIMETYPE";
+ string mainTable = "MES_JJGZ_TIMETYPE";
try
{
- var sqlMain = $"SELECT * FROM {mainTable} WHERE CHECK_STATUS = 1";
+ string sqlMain = $"SELECT * FROM {mainTable} WHERE CHECK_STATUS = 1";
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 _tb = dsMain.Tables[0].TableToDynamicList();
m.list = _tb;
@@ -280,10 +263,9 @@
{
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, "璇诲彇澶辫触锛�");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3