解决卡片查询时间bug

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceKindViewModel.cs

@@ -360,13 +360,13 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 开始时间
         /// </summary>
-        private string startTime = string.Empty;
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
         public string StartTime
         {
             get { return startTime; }
             set { startTime = value; RaisePropertyChanged(); }
         }
-        private string endTime = string.Empty;
+        private string endTime = DateTime.Now.ToString();
         public string EndTime
         {
             get { return endTime; }

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceViewModel.cs

@@ -401,13 +401,13 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 开始时间
         /// </summary>
-        private string startTime = string.Empty;
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
         public string StartTime
         {
             get { return startTime; }
             set { startTime = value; RaisePropertyChanged(); }
         }
-        private string endTime = string.Empty;
+        private string endTime = DateTime.Now.ToString();
         public string EndTime
         {
             get { return endTime; }

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/ProjectViewModel.cs

@@ -316,13 +316,13 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 开始时间
         /// </summary>
-        private string startTime= string.Empty;
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
         public string StartTime
         {
             get { return startTime; }
             set { startTime = value; RaisePropertyChanged(); }
         }
-        private string endTime = string.Empty;
+        private string endTime =DateTime.Now.ToString();
         public string EndTime
         {
             get { return endTime; }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ProjectTestResultViewModel.cs

@@ -71,6 +71,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                               where (string.IsNullOrEmpty(ProjectNo) ? true : (a.txtProjectNo.Text == ProjectNo))
                               && (string.IsNullOrEmpty(ProjectName) ? true : (a.txtName.Text == ProjectName))
                                 && (string.IsNullOrEmpty(ProjectLeader) ? true : (a.txtProjectLeader.Text == ProjectLeader))
+                                 && (EndTime == string.Empty ? true : (Convert.ToDateTime(a.txtCreateTime.Text) < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < Convert.ToDateTime(a.txtCreateTime.Text)))
                               select a).ToList();
             ProjectResultPicList = new ObservableCollection<DeviceResultCardView>(conditions);
         }
@@ -196,6 +197,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 int noPassCount = (int)allDeviceList?.FindAll(x => (x.ProjectName == project) && (x.TestResult == "不通过")).Count;
                 //添加卡片
                 DeviceResultCardView deviceCard = new DeviceResultCardView();
+                //创建时间
+                deviceCard.txtCreateTime.Text = _iBasicProjectService.FindByProjectName(project)?.create_time.ToString();
                 deviceCard.txtName.Text = project;
                 deviceCard.txtProjectNo.Text = _iBasicProjectService.FindByProjectName(project)?.project_no;
                 deviceCard.txtProjectLeader.Text = _iBasicProjectService.FindByProjectName(project)?.project_leader;
@@ -283,13 +286,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 开始时间
         /// </summary>
-        private string startTime = string.Empty;
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
         public string StartTime
         {
             get { return startTime; }
             set { startTime = value; RaisePropertyChanged(); }
         }
-        private string endTime = string.Empty;
+        private string endTime = DateTime.Now.ToString();
         public string EndTime
         {
             get { return endTime; }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ProjectTestViewModel.cs

@@ -67,6 +67,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                               where (string.IsNullOrEmpty(ProjectNo) ? true : (a.txtProjectNo.Text == ProjectNo))
                               && (string.IsNullOrEmpty(ProjectName) ? true : (a.txtName.Text == ProjectName))
                                 && (string.IsNullOrEmpty(ProjectLeader) ? true : (a.txtPProjectLeader.Text == ProjectLeader))
+                                && (EndTime == string.Empty ? true : (Convert.ToDateTime(a.txtCreateTime.Text) < Convert.ToDateTime(EndTime)) && (Convert.ToDateTime(StartTime) < Convert.ToDateTime(a.txtCreateTime.Text)))
                               select a).ToList();
             ProjectePicList = new ObservableCollection<DeviceTestCardView>(conditions);
         }
@@ -129,6 +130,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 int deviceCount = devices.Count();
                 //添加卡片
                 DeviceTestCardView deviceCard = new DeviceTestCardView();
+                //创建时间
+                deviceCard.txtCreateTime.Text = _iBasicProjectService.FindByProjectName(project)?.create_time.ToString();
                 deviceCard.txtName.Text = project;
                 deviceCard.txtProjectNo.Text = _iBasicProjectService.FindByProjectName(project)?.project_no;
                 deviceCard.txtPProjectLeader.Text = _iBasicProjectService.FindByProjectName(project)?.project_leader;
@@ -219,13 +222,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// <summary>
         /// 开始时间
         /// </summary>
-        private string startTime = string.Empty;
+        private string startTime = DateTime.Now.AddDays(-1).ToString();
         public string StartTime
         {
             get { return startTime; }
             set { startTime = value; RaisePropertyChanged(); }
         }
-        private string endTime = string.Empty;
+        private string endTime = DateTime.Now.ToString();
         public string EndTime
         {
             get { return endTime; }

BlankApp1/BlankApp1/Views/BusinessManageView/DeviceResultCardView.xaml

@@ -50,6 +50,8 @@
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtTestCount" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left"/>
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtPassCount" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left"/>
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtNoPassCount" Grid.Row="5" Grid.Column="1" Foreground="Red" HorizontalAlignment="Left"/>
+                <!--这只是查询使用，无其他用途，不显示-->
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtCreateTime" Foreground="Red" Grid.Row="5" Grid.Column="1"  HorizontalAlignment="Left" Visibility="Hidden"/>
             </Grid>
 
         </Grid>

BlankApp1/BlankApp1/Views/BusinessManageView/DeviceTestCardView.xaml

@@ -8,7 +8,7 @@
               prism:ViewModelLocator.AutoWireViewModel="True"
               mc:Ignorable="d" 
               Height="280" d:DesignWidth="260">
-    <Border BorderBrush="#CBCBCB"  BorderThickness="1" CornerRadius="5" Margin="10">
+    <Border x:Name="borderTestCard" BorderBrush="#CBCBCB"  BorderThickness="1" CornerRadius="5" Margin="10">
         <Grid >
 
             <Grid.InputBindings>
@@ -53,6 +53,8 @@
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtPProjectLeader" Grid.Row="1" Grid.Column="1"  HorizontalAlignment="Left"/>
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtDeviceCount" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left"/>
                 <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtNoTestCount" Foreground="Red" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left"/>
+                <!--这只是查询使用，无其他用途，不显示-->
+                <TextBlock Margin="0,10,0,0" Style="{StaticResource NormalTextBlockStyle}" x:Name="txtCreateTime" Foreground="Red" Grid.Row="3" Grid.Column="1"  HorizontalAlignment="Left" Visibility="Hidden"/>
             </Grid>
 
         </Grid>