From 342b165ea43f6b679fc4a794c47541abc61f5ad6 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 05 一月 2023 16:46:51 +0800
Subject: [PATCH] App个人计件工资接口修改
---
VueWebApi/DLL/DAL/AppPersonalDAL.cs | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppPersonalDAL.cs b/VueWebApi/DLL/DAL/AppPersonalDAL.cs
index a8bc3c6..4a49934 100644
--- a/VueWebApi/DLL/DAL/AppPersonalDAL.cs
+++ b/VueWebApi/DLL/DAL/AppPersonalDAL.cs
@@ -26,22 +26,10 @@
string search = "";
try
{
- if (usercode != "" && usercode != null)
- {
- search += "and B.report_person=@usercode ";
- dynamicParams.Add("@usercode", usercode);
- }
- if (startopendate != "" && startopendate != null)
- {
- search += "and B.report_date between @startopendate and @endclosedate ";
- dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
- dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
- }
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ dynamicParams.Add("@usercode", usercode);
+ dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
+ dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
+
// --------------鏌ヨ鎶ュ伐鏁般�佽壇鍝佹墸闄ゃ�佽绠楀伐璧勬敹鍏�--------------
var sql = @"select isnull(sum(BB.report_qty),0) as report_qty,(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as userngbadmoney,
isnull(sum(BB.usermoney),0)-(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as usermoney
@@ -64,7 +52,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
- where "+search+") as AA) as BB ";
+ where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA) as BB ";
var data0 = DapperHelper.selectdata(sql, dynamicParams);
dList.Add("dt0", data0);
// --------------鏌ヨ鎶ュ伐鏄庣粏(鎸夌収宸ュ崟銆佷骇鍝併�佸伐搴忓垎缁�)--------------
@@ -87,7 +75,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
- where "+search+") as AA group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
+ where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
var data1 = DapperHelper.selectdata(sql1, dynamicParams);
dList.Add("dt1", data1);
mes.code = "200";
--
Gitblit v1.9.3