From 06199678b5614cfb5aa8c53dfa628d769c561c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=8B=97=E8=9B=8B?= <12086832+li-goudan233@user.noreply.gitee.com> Date: Thu, 20 Mar 2025 11:55:59 +0800 Subject: [PATCH] 1 --- .../v17/DocumentLayout.backup.json | 80 ++++++++++++++++--- .../Pilot.Report.Exploitation.csproj | 2 - .../ResultsKanbanSumReport.cs | 41 +++------- .../ResultsReportServicePlugIn.cs | 60 -------------- 4 files changed, 80 insertions(+), 103 deletions(-) delete mode 100644 Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsReportServicePlugIn.cs diff --git a/.vs/Pilot.Report/v17/DocumentLayout.backup.json b/.vs/Pilot.Report/v17/DocumentLayout.backup.json index 75bb071..a0bede5 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.backup.json @@ -1,32 +1,86 @@ { "Version": 1, - "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\", + "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Pilot.Report\\Pilot.Report\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|e:\\gzc#code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\pilot.report\\pilot.report\\pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\tvgkdhe3..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\tvgkdhe3..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" } ], "DocumentGroupContainers": [ { - "Orientation": 0, + "Orientation": 1, "VerticalTabListWidth": 256, "DocumentGroups": [ { - "DockedWidth": 200, - "SelectedChildIndex": 0, + "DockedHeight": 200, + "SelectedChildIndex": 3, "Children": [ + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "infydjzb..sql ", + "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql", + "ToolTip": "infydjzb..sql ", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-03-19T10:54:19.227Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "tvgkdhe3..sql ", + "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\tvgkdhe3..sql", + "ToolTip": "tvgkdhe3..sql ", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-03-18T01:33:40.742Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql ", + "DocumentMoniker": "C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql", + "ToolTip": "\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql ", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-03-18T01:34:20.652Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 0, - "Title": "AnnualSalesPaymentSumReport.cs", - "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "RelativeToolTip": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "ViewState": "AgIAAJgDAAAAAAAAAAAQwBsEAAAbAAAAAAAAAA==", + "Title": "ResultsKanbanSumReport.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAH4AAAAgAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-17T07:39:30.7Z", + "WhenOpened": "2025-03-14T11:26:46.159Z", "EditorCaption": "" } ] diff --git a/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj b/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj index 2786c60..788d8bf 100644 --- a/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj +++ b/Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj @@ -188,11 +188,9 @@ - - diff --git a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs index c3b2f36..ace1435 100644 --- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs +++ b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs @@ -38,8 +38,6 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary this.ReportProperty.IsGroupSummary = true; // this.ReportProperty.SimpleAllCols = false; - // 单据主键：两行FID相同，则为同一单的两条分录，单据编号可以不重复显示 - this.ReportProperty.PrimaryKeyFieldName = "FID"; // this.ReportProperty.IsDefaultOnlyDspSumAndDetailData = true; @@ -70,14 +68,12 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary ReportHeader header = new ReportHeader(); // 下单时间 - string fDate = customFilter["F_Date"]?.ToString(); + string fDate = customFilter["FSDate"]?.ToString(); int year = Convert.ToInt32(fDate.Split('-')[0]); - //int year = 2011; - //header.AddChild("ID", new LocaleValue("序号"), SqlStorageType.Sqlvarchar); - header.AddChild("SBU", new LocaleValue("SBU"), SqlStorageType.Sqlvarchar); - header.AddChild("明细区域", new LocaleValue("明细区域"), SqlStorageType.Sqlvarchar); + header.AddChild("F_SBU", new LocaleValue("SBU"), SqlStorageType.Sqlvarchar); + header.AddChild("F_MXQY", new LocaleValue("明细区域"), SqlStorageType.Sqlvarchar); header.AddChild("销售员", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar); header.AddChild("本年业绩目标_万元", new LocaleValue(""+year+"年业绩目标（万元）"), SqlStorageType.SqlDecimal); header.AddChild("本年派诺业绩_万元", new LocaleValue(""+year+ "派诺业绩（万元）"), SqlStorageType.SqlDecimal); @@ -113,34 +109,23 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary { DynamicObject customFilter = filter.FilterParameter.CustomFilter; - // 销售员列表 - var salesperson = (customFilter["F_Salesperson"] as DynamicObjectCollection)?.Select(n => (n["F_Salesperson"] as DynamicObject)["msterID"].ToString()).ToList(); - - // 销售员 - var salespersonString = salesperson == null ? "" : string.Join(",", salesperson); - - // 组织列表 - var organizationList = (customFilter["FZuZhi"] as DynamicObjectCollection)?.Select(n => (n["FZuZhi"] as DynamicObject)["ID"].ToString()).ToList(); - - // 组织 - var organization = organizationList == null ? "" : (string.Join(",", organizationList)); + DynamicObject dynamic = customFilter["F_Salesperson"] as DynamicObject; // 开始日期 - string fStrartDate = customFilter["FSDate"]?.ToString(); + string fStrartDate = Convert.ToString(customFilter["FSDate"]); // 结束日期 - string fEndDate = customFilter["FEDate"]?.ToString(); + string fEndDate = Convert.ToString(customFilter["FEDate"]); base.BuilderReportSqlAndTempTable(filter, tableName); - string sql = string.Format("EXEC GZ_JXKBHZB_LTH '{0}','{1}' " + - "SELECT" + - "ROW_NUMBER() OVER (ORDER BY SBU DESC) AS FID," + - "ROW_NUMBER() OVER (ORDER BY SBU DESC) AS FIDENTITYID," + - " * INTO {2} FROM JXKBHZB", fStrartDate,fEndDate,tableName); - - Loghelp.Log("BuilderReportSqlAndTempTable"); - Loghelp.Log(sql); + 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 +", fStrartDate,fEndDate,tableName); DBUtils.Execute(this.Context, sql); } diff --git a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsReportServicePlugIn.cs b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsReportServicePlugIn.cs deleted file mode 100644 index 41e6d03..0000000 --- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsReportServicePlugIn.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Kingdee.BOS.Core.Metadata; -using Kingdee.BOS.Core.Report.PlugIn; -using Kingdee.BOS.Core.Report.PlugIn.Args; -using Kingdee.BOS.Util; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Pilot.Report.Exploitation.ResultsKanbanSummary -{ - [Description("【报表表单插件】绩效看板汇总报表插件"), HotUpdate] - public class ResultsReportServicePlugIn: AbstractSysReportPlugIn - { - List _rates = new string[] { "AttainmentRate", "SameGrowthRate", "PaymentRate" }.ToList(); - public override void FormatCellValue(FormatCellValueArgs args) - { - // 格式化日期 - base.FormatCellValue(args); - if (args.Header.ColType == Kingdee.BOS.SqlStorageType.SqlDatetime) - { - DateTime value = Convert.ToDateTime(args.FormateValue); - string afterValue = value.ToString("yyyy-MM-dd"); - args.FormateValue = afterValue; - } - // 格式化金额 汇率不格式化 - if (args.Header.ColType == Kingdee.BOS.SqlStorageType.SqlDecimal) - { - decimal value = decimal.Parse(args.FormateValue); - // 千分位 - string afterValue = value.ToString("N"); - args.FormateValue = afterValue; - } - if (args.Header.ColType == Kingdee.BOS.SqlStorageType.Sqlvarchar && _rates.Contains(args.Header.Key)) - { - decimal value = decimal.Parse(args.FormateValue); - // 不显示小数 - string afterValue = value.ToString("N") + "%"; // "F" 表示固定点格式，"0" 表示小数位数为0 - args.FormateValue = afterValue; - } - - } - public override void OnFormatRowConditions(ReportFormatConditionArgs args) - { - base.OnFormatRowConditions(args); - - //行背景色：FROWNO为偶数的行，背景色设为灰色 - if (Convert.ToInt32(args.DataRow["Sort"]) == 0 || Convert.ToInt32(args.DataRow["Sort"]) == 3) - { - FormatCondition FRow_FC = new FormatCondition() - { - BackColor = "#FCE4D6", - }; - args.FormatConditions.Add(FRow_FC); - } - } - } -}