查询添加时分

一车两车整合版/Model/TeamModel.cs

@@ -25,5 +25,9 @@ namespace GCAS.Model
         /// 添加时间
         /// </summary>
         public DateTime Time { get; set; }
+        /// <summary>
+        /// 是否跨天
+        /// </summary>
+        public int NextDay { get; set; }
     }
 }

一车两车整合版/Record/RecordForm.Designer.cs

@@ -242,6 +242,18 @@
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("date_start.Properties.Buttons"))))});
             this.date_start.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("date_start.Properties.CalendarTimeProperties.Buttons"))))});
+            this.date_start.Properties.CalendarTimeProperties.Mask.EditMask = resources.GetString("date_start.Properties.CalendarTimeProperties.Mask.EditMask");
+            this.date_start.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.Vista;
+            this.date_start.Properties.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm";
+            this.date_start.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.date_start.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm";
+            this.date_start.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.date_start.Properties.Mask.EditMask = resources.GetString("date_start.Properties.Mask.EditMask");
+            this.date_start.Properties.VistaCalendarViewStyle = ((DevExpress.XtraEditors.VistaCalendarViewStyle)(((((DevExpress.XtraEditors.VistaCalendarViewStyle.MonthView | DevExpress.XtraEditors.VistaCalendarViewStyle.YearView) 
+            | DevExpress.XtraEditors.VistaCalendarViewStyle.QuarterView) 
+            | DevExpress.XtraEditors.VistaCalendarViewStyle.YearsGroupView) 
+            | DevExpress.XtraEditors.VistaCalendarViewStyle.CenturyView)));
+            this.date_start.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.True;
             this.date_start.StyleController = this.layoutControl1;
             // 
             // btn_search
@@ -260,6 +272,11 @@
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("date_end.Properties.Buttons"))))});
             this.date_end.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("date_end.Properties.CalendarTimeProperties.Buttons"))))});
+            this.date_end.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.Vista;
+            this.date_end.Properties.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm";
+            this.date_end.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.date_end.Properties.Mask.EditMask = resources.GetString("date_end.Properties.Mask.EditMask");
+            this.date_end.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.True;
             this.date_end.StyleController = this.layoutControl1;
             // 
             // cb_entrance

一车两车整合版/Record/RecordForm.cs

@@ -32,7 +32,9 @@ namespace GCAS
         private void RecordForm_Load(object sender, EventArgs e)
         {
 
-            date_start.EditValue = DateTime.Today;
+            //date_start.EditValue = DateTime.Today;
+            //date_end.EditValue = DateTime.Today.AddDays(1).AddSeconds(-1);
+            date_start.EditValue = DateTime.Now;
             date_end.EditValue = DateTime.Today.AddDays(1).AddSeconds(-1);
             recordRepository = new RecordRepository();
             deviceRepository = new DeviceRepository();
@@ -95,7 +97,7 @@ namespace GCAS
                 cb_entrance.EditValue == null ? 0 : (int)cb_entrance.EditValue,
                 cb_team.EditValue == null ? 0 : (int)cb_team.EditValue,
                 (DateTime)date_start.EditValue,
-                ((DateTime)date_end.EditValue).AddDays(1).AddSeconds(-1));
+                (DateTime)date_end.EditValue);
             gridControl1.DataSource = list;
             gridView1.FocusedRowHandle = -1;
             gridView1.LoadingPanelVisible = false;

一车两车整合版/Record/RecordForm.resx

@@ -284,8 +284,8 @@
   <data name="&gt;&gt;text_key.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
-  <data name="date_start.EditValue" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
+  <data name="date_start.EditValue" type="System.DateTime, mscorlib">
+    <value>06/19/2022 16:06:06</value>
   </data>
   <data name="date_start.Location" type="System.Drawing.Point, System.Drawing">
     <value>354, 12</value>
@@ -297,6 +297,12 @@
   <data name="date_start.Properties.CalendarTimeProperties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v18.1">
     <value>Combo</value>
   </data>
+  <data name="date_start.Properties.CalendarTimeProperties.Mask.EditMask" xml:space="preserve">
+    <value>yyyy-MM-dd HH:mm</value>
+  </data>
+  <data name="date_start.Properties.Mask.EditMask" xml:space="preserve">
+    <value>yyyy-MM-dd HH:mm</value>
+  </data>
   <data name="date_start.Size" type="System.Drawing.Size, System.Drawing">
     <value>262, 20</value>
   </data>
@@ -375,6 +381,9 @@
   <data name="date_end.Properties.CalendarTimeProperties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v18.1">
     <value>Combo</value>
   </data>
+  <data name="date_end.Properties.Mask.EditMask" xml:space="preserve">
+    <value>yyyy-MM-dd HH:mm</value>
+  </data>
   <data name="date_end.Size" type="System.Drawing.Size, System.Drawing">
     <value>264, 20</value>
   </data>

一车两车整合版/Reports/ReportForm.cs

@@ -30,6 +30,7 @@ namespace GCAS
         private DateTime endTime;
         private List<DeviceModel> devices;
         private List<TeamModel> teams;
+        private TeamModel teamNext;
         private List<EntranceModel> entrances;
         private string range;
         private string type;
@@ -50,6 +51,7 @@ namespace GCAS
             entrances = entranceRepository.GetList();
             teamRepository = new TeamRepository();
             teams = teamRepository.GetList();
+            teamNext = teams.Where(c => c.NextDay == 1).FirstOrDefault();
             cb_range.SelectedIndex = 0;
             cb_types.SelectedIndex = 0;
             await BindGridAsync();
@@ -63,7 +65,26 @@ namespace GCAS
             dt.Columns.Add(new DataColumn("TotalCount", typeof(int)));
             dt.Columns.Add(new DataColumn("TotalWeight", typeof(double)));
             gridView1.LoadingPanelVisible = true;
+            if (teamNext != null && cb_range.SelectedIndex >= 1)
+            {
+                endTime = Convert.ToDateTime(endTime.AddDays(1).ToShortDateString() + " " + teamNext.EndTime);
+            }
             var query = await recordRepository.GetList(null, 0, 0, 0, startTime, endTime);
+            if (teamNext != null && cb_range.SelectedIndex >= 1)
+            {
+                foreach (var item in query)
+                {
+                    if (item.Team == teamNext.Id)
+                    {
+                        var tempTime = Convert.ToDateTime(item.Time.ToShortDateString() + " " + teamNext.EndTime);
+                        if (item.Time < tempTime)
+                        {
+                            item.Time = item.Time.AddDays(-1);
+                        }
+                    }
+                }
+            }
+
             ArrayList tempList = new ArrayList();
             switch (cb_range.SelectedIndex)
             {