Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom

GZ_LTHReportForms.csproj

@@ -128,4 +128,7 @@
     <Content Include="Library\NPOI.OpenXmlFormats.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>copy  $(TargetPath) "D:\Program Files (x86)\Kingdee\K3Cloud\WebSite\Bin\$(TargetFileName)"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

JiXiaoKanBan/ResultsKanbanSumReport.cs

@@ -50,6 +50,68 @@ namespace GZ_LTHReportForms.JiXiaoKanBan
             this.ReportProperty.DecimalControlFieldList = list;
         }
 
+        /// <summary>
+        /// 填充过滤条件
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public override ReportTitles GetReportTitles(IRptParams filter)
+        {
+
+            ReportTitles reportTitles = new ReportTitles();
+            DynamicObject customFilter = filter.FilterParameter.CustomFilter;
+            if (customFilter == null)
+            {
+                return reportTitles;
+            }
+            // 供需组织 List
+            var salesPersons = customFilter["F_Salesperson"] as DynamicObjectCollection;
+            if (salesPersons.Count > 0)
+            {
+                reportTitles.AddTitle("F_Salesperson", string.Join(",", salesPersons.Select(n => n["Name"].ToString())));
+            }
+            var startDate = Convert.ToDateTime(customFilter["FSDate"]);
+            var endDate = Convert.ToDateTime(customFilter["FEDate"]);
+
+            reportTitles.AddTitle("FStartDate", startDate.ToString("yyyy-MM-dd"));
+
+            reportTitles.AddTitle("FEndDate", endDate.ToString("yyyy-MM-dd"));
+
+            return reportTitles;
+        }
+        /// <summary>
+        /// 显示报表数据
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="tableName"></param>
+        public override void BuilderReportSqlAndTempTable(IRptParams filter, string tableName)
+        {
+            //获取过滤条件
+            string Filter = GetFilterWhere(filter);
+
+            base.BuilderReportSqlAndTempTable(filter, tableName);
+
+            DynamicObject customFilter = filter.FilterParameter.CustomFilter;
+
+            // 开始日期
+            string fStrartDate = (customFilter["FSDate"] == null) ? "" : Convert.ToDateTime(
+                customFilter["FSDate"]).ToString("yyyy-MM-dd");
+
+            // 结束日期
+            string fEndDate = (customFilter["FEDate"] == null) ? "" : Convert.ToDateTime(
+                customFilter["FEDate"]).ToString("yyyy-MM-dd");
+
+            string sql = string.Format(@"/*dialect*/
+        EXEC GZ_JXKBHZB_LTH '{0}','{1}'
+        SELECT 
+        ROW_NUMBER() OVER (ORDER BY F_SBU DESC) AS FID,
+        ROW_NUMBER() OVER (ORDER BY F_SBU DESC) AS FIDENTITYID,
+        * INTO {2} FROM JXKBHZB {3}
+", fStrartDate, fEndDate, tableName, Filter);
+            DBUtils.Execute(this.Context, sql);
+        }
+
+
         /// <summary>
         /// 报表列表头
         /// </summary>
@@ -62,8 +124,6 @@ namespace GZ_LTHReportForms.JiXiaoKanBan
             base.GetReportHeaders(filter);
 
             ReportHeader header = new ReportHeader();
-
-
             // 下单时间
             int currentYear = DateTime.Now.Year;
 
@@ -102,37 +162,7 @@ namespace GZ_LTHReportForms.JiXiaoKanBan
             return header;
         }
 
-        /// <summary>
-        /// 显示报表数据
-        /// </summary>
-        /// <param name="filter"></param>
-        /// <param name="tableName"></param>
-        public override void BuilderReportSqlAndTempTable(IRptParams filter, string tableName)
-        {
-            //获取过滤条件
-            string Filter = GetFilterWhere(filter);
 
-            base.BuilderReportSqlAndTempTable(filter, tableName);
-
-            DynamicObject customFilter = filter.FilterParameter.CustomFilter;
-
-            // 开始日期
-            string fStrartDate = (customFilter["FSDate"] == null) ? "" : Convert.ToDateTime(
-                customFilter["FSDate"]).ToString("yyyy-MM-dd");
-
-            // 结束日期
-            string fEndDate = (customFilter["FEDate"] == null) ? "" : Convert.ToDateTime(
-                customFilter["FEDate"]).ToString("yyyy-MM-dd");
-
-            string sql = string.Format(@"/*dialect*/
-        EXEC GZ_JXKBHZB_LTH '{0}','{1}'
-        SELECT 
-        ROW_NUMBER() OVER (ORDER BY F_SBU DESC) AS FID,
-        ROW_NUMBER() OVER (ORDER BY F_SBU DESC) AS FIDENTITYID,
-        * INTO {2} FROM JXKBHZB {3}
-", fStrartDate, fEndDate, tableName, Filter);
-            DBUtils.Execute(this.Context, sql);
-        }
 
         //报表过滤条件-多选销售员
         private string GetFilterWhere(IRptParams filter)