Merge branch 'master' of https://git.kivii.org/neoturing/Jst.Client.Report.Download

Src/Entities/ReportRequest.cs

@@ -678,37 +678,37 @@ namespace Jst.Report.Download
             set;
         }
 
-        public DateTime? DealDateGreaterThan
+        public DateTime? DealDateGreaterThanOrEqualTo
         {
             get;
             set;
         }
 
-        public DateTime? DealDateLessThan
+        public DateTime? DealDateLessThanOrEqualTo
         {
             get;
             set;
         }
 
-        public DateTime? DeadDateGreaterThan
+        public DateTime? DeadDateGreaterThanOrEqualTo
         {
             get;
             set;
         }
 
-        public DateTime? DeadDateLessThan
+        public DateTime? DeadDateLessThanOrEqualTo
         {
             get;
             set;
         }
 
-        public DateTime? IssueDateGreaterThan
+        public DateTime? IssueDateGreaterThanOrEqualTo
         {
             get;
             set;
         }
 
-        public DateTime? IssueDateLessThan
+        public DateTime? IssueDateLessThanOrEqualTo
         {
             get;
             set;

Src/FrmMain.Designer.cs

@@ -816,7 +816,7 @@ namespace Jst.Report.Download
             this.Controls.Add(this.pnlLeft);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmMain";
-            this.Text = "江苏纺检院电子报告下载客户端V2.01";
+            this.Text = "江苏纺检院电子报告下载客户端V2.02";
             this.Load += new System.EventHandler(this.FrmMain_Load);
             this.pnlLeft.ResumeLayout(false);
             this.gbQuery.ResumeLayout(false);

Src/FrmMain.cs

@@ -235,27 +235,27 @@ namespace Jst.Report.Download
             }
             if (dtpDealDateBegin.Text != " ")
             {
-                contractQuery.DealDateGreaterThan = DateTime.Parse(dtpDealDateBegin.Value.ToShortDateString().ToString());
+                contractQuery.DealDateGreaterThanOrEqualTo = DateTime.Parse(dtpDealDateBegin.Value.ToShortDateString().ToString());
             }
             if (dtpDealDateFinish.Text != " ")
             {
-                contractQuery.DealDateLessThan = DateTime.Parse(dtpDealDateFinish.Value.AddDays(1.0).ToShortDateString().ToString());
+                contractQuery.DealDateLessThanOrEqualTo = DateTime.Parse(dtpDealDateFinish.Value.AddDays(1.0).ToShortDateString().ToString());
             }
             if (dtpDeadDateBegin.Text != " ")
             {
-                contractQuery.DeadDateGreaterThan = DateTime.Parse(dtpDeadDateBegin.Value.ToShortDateString().ToString());
+                contractQuery.DeadDateGreaterThanOrEqualTo = DateTime.Parse(dtpDeadDateBegin.Value.ToShortDateString().ToString());
             }
             if (dtpDeadDateFinish.Text != " ")
             {
-                contractQuery.DeadDateLessThan = DateTime.Parse(dtpDeadDateFinish.Value.AddDays(1.0).ToShortDateString().ToString());
+                contractQuery.DeadDateLessThanOrEqualTo = DateTime.Parse(dtpDeadDateFinish.Value.AddDays(1.0).ToShortDateString().ToString());
             }
             if (dtpReportIssueDateBegin.Text != " ")
             {
-                contractQuery.IssueDateGreaterThan = DateTime.Parse(dtpReportIssueDateBegin.Value.ToShortDateString().ToString());
+                contractQuery.IssueDateGreaterThanOrEqualTo = DateTime.Parse(dtpReportIssueDateBegin.Value.ToShortDateString().ToString());
             }
             if (dtpReportIssueDateFinish.Text != " ")
             {
-                contractQuery.IssueDateLessThan = DateTime.Parse(dtpReportIssueDateFinish.Value.AddDays(1.0).ToShortDateString().ToString());
+                contractQuery.IssueDateLessThanOrEqualTo = DateTime.Parse(dtpReportIssueDateFinish.Value.AddDays(1.0).ToShortDateString().ToString());
             }
             //contractQuery.DealDateGreaterThan = dtpDealDateBegin.Value;			
             //contractQuery.DealDateLessThan = dtpDealDateFinish.Value.AddDays(1.0);

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2021.09270")]
-[assembly: AssemblyFileVersion("5.4.2021.09270")]
+[assembly: AssemblyVersion("5.4.2022.04270")]
+[assembly: AssemblyFileVersion("5.4.2022.04270")]