diff --git a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs index 9702f1c..223b0b2 100644 --- a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs +++ b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs @@ -17,6 +17,9 @@ namespace Pilot.Report.Exploitation.SBUYingShouBiao [Description("应收款情况表(SBU)报表插件"), HotUpdate] public class SBUYingShouBiaoReport : SysReportBaseService { + + public DateTime? beginTime = null; + public DateTime? endTime = null; //初始化方法 public override void Initialize() { @@ -37,7 +40,7 @@ namespace Pilot.Report.Exploitation.SBUYingShouBiao DynamicObject customFilter = filter.FilterParameter.CustomFilter; if (customFilter != null) { - ////获取组织名称 + //获取组织名称 //string multiOrgnNameValues = this.GetMultiOrgnNameValues(customFilter["F_YKQC_OrgId_uky"] as DynamicObject); ////获取起始日期 //string startValue = (customFilter["F_YKQC_Date_qtr"] == null) ? string.Empty : @@ -135,6 +138,11 @@ namespace Pilot.Report.Exploitation.SBUYingShouBiao string end = now.ToString(); //获取过滤条件 string Filter = GetFilterWhere(filter); + if (beginTime.HasValue) + begin = beginTime.Value.ToString("yyyy-MM-dd"); + if (endTime.HasValue) + end = endTime.Value.ToString("yyyy-MM-dd"); + /* 取数SQL SQL查询字符串,提取所需数据并将结果存入临时表 @@ -223,20 +231,22 @@ FROM T_SAL_ORDERFIN aa strwhere.AppendLine(org); } - ////日期 - //string startValue = (customFilter["F_YKQC_Date_qtr"] == null) ? string.Empty : - // Convert.ToDateTime(customFilter["F_YKQC_Date_qtr"]).ToString("yyyy-MM-dd"); - //string endValue = (customFilter["F_YKQC_Date_83g"] == null) ? string.Empty : - // Convert.ToDateTime(customFilter["F_YKQC_Date_83g"]).ToString("yyyy-MM-dd"); - ////添加日期过滤条件 - //if (!String.IsNullOrWhiteSpace(startValue)) - //{ - // strwhere.AppendLine(string.Format(@"AND A.FDate >= '{0}'", startValue)); - //} - //if (!String.IsNullOrWhiteSpace(endValue)) - //{ - // strwhere.AppendLine(string.Format(@"AND A.FDate <= '{0}'", endValue)); - //} + //日期 + string startValue = (customFilter["F_YKQC_Date_qtr"] == null) ? string.Empty : + Convert.ToDateTime(customFilter["F_YKQC_Date_qtr"]).ToString("yyyy-MM-dd"); + string endValue = (customFilter["F_YKQC_Date_83g"] == null) ? string.Empty : + Convert.ToDateTime(customFilter["F_YKQC_Date_83g"]).ToString("yyyy-MM-dd"); + //添加日期过滤条件 + if (!String.IsNullOrWhiteSpace(startValue)) + { + //strwhere.AppendLine(string.Format(@"AND A.FDate >= '{0}'", startValue)); + beginTime = Convert.ToDateTime(startValue).Date; + } + if (!String.IsNullOrWhiteSpace(endValue)) + { + endTime= Convert.ToDateTime(endValue).AddDays(1).Date; + //strwhere.AppendLine(string.Format(@"AND A.FDate <= '{0}'", endValue)); + } return strwhere.ToString(); }