Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
余宇波
2025-03-20 11:58:03 +08:00
parent bcd14e1b03
commit 3ad0f2055c
3 changed files with 96 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
View File

@@ -135,17 +135,17 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum
// 组织
var organization = organizationList == null ? "" : (string.Join(",", organizationList));
// 开始日期
string fStrartDate = customFilter["FStrartDate"]?.ToString();
//// 开始日期
//string fStrartDate = customFilter["FStrartDate"]?.ToString();
// 结束日期
string fEndDate = customFilter["FEndDate"]?.ToString();
//// 结束日期
//string fEndDate = customFilter["FEndDate"]?.ToString();
// 审核开始日期
string fSDate = customFilter["FSDate"]?.ToString();
//// 审核开始日期
//string fSDate = customFilter["FSDate"]?.ToString();
// 审核结束日期
string fEDate = customFilter["FEDate"]?.ToString();
//// 审核结束日期
//string fEDate = customFilter["FEDate"]?.ToString();
// 下单时间
string fDate = customFilter["F_Date"]?.ToString();
@@ -467,14 +467,14 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum
{
sql += string.Format(@" AND D.FSALEORGID in ({0})", organization);
}
if (!string.IsNullOrEmpty(fStrartDate))
{
sql += string.Format(@" AND D.FDate >= '{0}'", fStrartDate);
}
if (!string.IsNullOrEmpty(fEndDate))
{
sql += string.Format(@" AND D.FDate <= '{0}'", fEndDate);
}
//if (!string.IsNullOrEmpty(fStrartDate))
//{
// sql += string.Format(@" AND D.FDate >= '{0}'", fStrartDate);
//}
//if (!string.IsNullOrEmpty(fEndDate))
//{
// sql += string.Format(@" AND D.FDate <= '{0}'", fEndDate);
//}
sql += string.Format(@";");
@@ -909,22 +909,22 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum
{
sql += string.Format(@" AND A.FSaleOrgId in ({0})", organization);
}
if (!string.IsNullOrEmpty(fStrartDate))
{
sql += string.Format(@" AND A.FDate >= '{0}'", fStrartDate);
}
if (!string.IsNullOrEmpty(fEndDate))
{
sql += string.Format(@" AND A.FDate <= '{0}'", fEndDate);
}
if (!string.IsNullOrEmpty(fSDate))
{
sql += string.Format(@" AND A.FAPPROVEDATE >= '{0}'", fSDate);
}
if (!string.IsNullOrEmpty(fEDate))
{
sql += string.Format(@" AND A.FAPPROVEDATE <= '{0}'", fEDate);
}
//if (!string.IsNullOrEmpty(fStrartDate))
//{
// sql += string.Format(@" AND A.FDate >= '{0}'", fStrartDate);
//}
//if (!string.IsNullOrEmpty(fEndDate))
//{
// sql += string.Format(@" AND A.FDate <= '{0}'", fEndDate);
//}
//if (!string.IsNullOrEmpty(fSDate))
//{
// sql += string.Format(@" AND A.FAPPROVEDATE >= '{0}'", fSDate);
//}
//if (!string.IsNullOrEmpty(fEDate))
//{
// sql += string.Format(@" AND A.FAPPROVEDATE <= '{0}'", fEDate);
//}
sql += string.Format(@";");