diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/97e06e8c-29ba-4df4-9aef-29d61e950e67.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/97e06e8c-29ba-4df4-9aef-29d61e950e67.vsidx deleted file mode 100644 index d381fc8..0000000 Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/97e06e8c-29ba-4df4-9aef-29d61e950e67.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHReportForms/v17/.suo b/.vs/GZ_LTHReportForms/v17/.suo index fa8b3ca..76d5e9f 100644 Binary files a/.vs/GZ_LTHReportForms/v17/.suo and b/.vs/GZ_LTHReportForms/v17/.suo differ diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json index f55be94..bc1659b 100644 --- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json +++ b/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json @@ -22,9 +22,9 @@ "Title": "YingShouQKBiao.cs", "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs", "RelativeDocumentMoniker": "YingShouBaoBiao\\YingShouQKBiao.cs", - "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs", - "RelativeToolTip": "YingShouBaoBiao\\YingShouQKBiao.cs", - "ViewState": "AgIAAI8AAAAAAAAAAAAUwJ0AAAAAAAAAAAAAAA==", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs*", + "RelativeToolTip": "YingShouBaoBiao\\YingShouQKBiao.cs*", + "ViewState": "AgIAABAAAAAAAAAAAAAAACMAAAAUAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-06-24T06:57:25.107Z", "EditorCaption": "" diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json index f55be94..6036d91 100644 --- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json +++ b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json @@ -24,7 +24,7 @@ "RelativeDocumentMoniker": "YingShouBaoBiao\\YingShouQKBiao.cs", "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs", "RelativeToolTip": "YingShouBaoBiao\\YingShouQKBiao.cs", - "ViewState": "AgIAAI8AAAAAAAAAAAAUwJ0AAAAAAAAAAAAAAA==", + "ViewState": "AgIAAF0AAAAAAAAAAAAAwJ8AAAA+AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-06-24T06:57:25.107Z", "EditorCaption": "" diff --git a/YingShouBaoBiao/YingShouQKBiao.cs b/YingShouBaoBiao/YingShouQKBiao.cs index f211777..055d649 100644 --- a/YingShouBaoBiao/YingShouQKBiao.cs +++ b/YingShouBaoBiao/YingShouQKBiao.cs @@ -41,18 +41,18 @@ namespace GZ_LTHReportForms.YingShouBiao { //获取组织名称 string multiOrgnNameValues = this.GetMultiOrgnNameValues(customFilter["F_YKQC_OrgId_uky"] as DynamicObject); - //获取起始日期 - string startValue = (customFilter["F_YKQC_Date_apv"] == null) ? string.Empty : - Convert.ToDateTime(customFilter["F_YKQC_Date_apv"]) - .ToString("yyyy-MM-dd"); - //获取结束日期 - string endValue = (customFilter["F_YKQC_Date_tzk"] == null) ? string.Empty : - Convert.ToDateTime(customFilter["F_YKQC_Date_tzk"]) - .ToString("yyyy-MM-dd"); - //添加标题信息 - reportTitles.AddTitle("F_YKQC_OrgId_re5", multiOrgnNameValues); - reportTitles.AddTitle("F_YKQC_Date_qtr", startValue); - reportTitles.AddTitle("F_YKQC_Date_83g", endValue); + ////获取起始日期 + //string startValue = (customFilter["F_YKQC_Date_apv"] == null) ? string.Empty : + // Convert.ToDateTime(customFilter["F_YKQC_Date_apv"]) + // .ToString("yyyy-MM-dd"); + ////获取结束日期 + //string endValue = (customFilter["F_YKQC_Date_tzk"] == null) ? string.Empty : + // Convert.ToDateTime(customFilter["F_YKQC_Date_tzk"]) + // .ToString("yyyy-MM-dd"); + ////添加标题信息 + //reportTitles.AddTitle("F_YKQC_OrgId_re5", multiOrgnNameValues); + //reportTitles.AddTitle("F_YKQC_Date_qtr", startValue); + //reportTitles.AddTitle("F_YKQC_Date_83g", endValue); } //返回标题 return reportTitles; diff --git a/bin/Debug/GZ_LTHReportForms.dll b/bin/Debug/GZ_LTHReportForms.dll index c705253..778bf26 100644 Binary files a/bin/Debug/GZ_LTHReportForms.dll and b/bin/Debug/GZ_LTHReportForms.dll differ diff --git a/bin/Debug/GZ_LTHReportForms.pdb b/bin/Debug/GZ_LTHReportForms.pdb index aeb6d39..09d465e 100644 Binary files a/bin/Debug/GZ_LTHReportForms.pdb and b/bin/Debug/GZ_LTHReportForms.pdb differ diff --git a/bin/Debug/Newtonsoft.Json.dll b/bin/Debug/Newtonsoft.Json.dll deleted file mode 100644 index d593ed6..0000000 Binary files a/bin/Debug/Newtonsoft.Json.dll and /dev/null differ diff --git a/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache b/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache index 4fd47b9..f678bf3 100644 Binary files a/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache and b/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt index bc27d64..de8bab3 100644 --- a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt +++ b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt @@ -33,7 +33,6 @@ E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHReportForms.pdb E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\ICSharpCode.SharpZipLib.dll F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\GZ_LTHReportForms.dll F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\GZ_LTHReportForms.pdb -F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\Newtonsoft.Json.dll F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\Oracle.DataAccess.dll F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHReportForms.csproj.AssemblyReference.cache F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHReportForms.csproj.CoreCompileInputs.cache diff --git a/obj/Debug/GZ_LTHReportForms.dll b/obj/Debug/GZ_LTHReportForms.dll index c705253..778bf26 100644 Binary files a/obj/Debug/GZ_LTHReportForms.dll and b/obj/Debug/GZ_LTHReportForms.dll differ diff --git a/obj/Debug/GZ_LTHReportForms.pdb b/obj/Debug/GZ_LTHReportForms.pdb index aeb6d39..09d465e 100644 Binary files a/obj/Debug/GZ_LTHReportForms.pdb and b/obj/Debug/GZ_LTHReportForms.pdb differ