From a0ae0c35b06d78cd16fd43f854e2109c42ce4ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Fri, 1 Mar 2024 14:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8A=A5=E8=A1=A8=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PublishProfiles/FolderProfile.pubxml      |  6 ++--
 ZR.Service/mes/qc/QCStatisticsService.cs      | 35 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
index 68a5a2d9..3c720a89 100644
--- a/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
@@ -7,16 +7,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <DeleteExistingFiles>true</DeleteExistingFiles>
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Debug\net7.0\publish\</PublishUrl>
+    <PublishUrl>bin\Release\net7.0\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>net7.0</TargetFramework>
     <ProjectGuid>e5497bb4-b0c1-4794-9fae-163f626ec399</ProjectGuid>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <EnvironmentName>production</EnvironmentName>
   </PropertyGroup>
diff --git a/ZR.Service/mes/qc/QCStatisticsService.cs b/ZR.Service/mes/qc/QCStatisticsService.cs
index 8a59de61..b920b049 100644
--- a/ZR.Service/mes/qc/QCStatisticsService.cs
+++ b/ZR.Service/mes/qc/QCStatisticsService.cs
@@ -33,11 +33,11 @@ namespace ZR.Service.mes.qc
         {
             int totalNum = 0;
             var predicate = Expressionable.Create<QcQualityStatisticsFirst>()
-                .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
                 //XXX:修改查询日期查询的字段
-                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
-                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
-                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
+                .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime.ToLocalTime())
+                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime <= endTime.ToLocalTime())
+                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Contains(workorderid))
+                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Contains(partnumber))
                 .AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
                 .AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
                 .ToExpression();
@@ -67,10 +67,11 @@ namespace ZR.Service.mes.qc
         {
             int totalNum = 0;
             var predicate = Expressionable.Create<QcQualityStatisticsAgain>()
-                   .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
-                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
-                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
-                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
+                //XXX:修改查询日期查询的字段
+                .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime.ToLocalTime())
+                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime <= endTime.ToLocalTime())
+                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Contains(workorderid))
+                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Contains(partnumber))
                 .AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
                 .AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
                 .ToExpression();
@@ -99,10 +100,11 @@ namespace ZR.Service.mes.qc
         {
             int totalNum = 0;
             var predicate = Expressionable.Create<QcQualityStatisticsFinal>()
-                  .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
-                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
-                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
-                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
+                //XXX:修改查询日期查询的字段
+                .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime.ToLocalTime())
+                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime <= endTime.ToLocalTime())
+                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Contains(workorderid))
+                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Contains(partnumber))
                 .AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
                 .AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
                 .ToExpression();
@@ -132,10 +134,11 @@ namespace ZR.Service.mes.qc
         {
             int totalNum = 0;
             var predicate = Expressionable.Create<QcQualityStatisticsTotal>()
-                    .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
-                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
-                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
-                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
+                //XXX:修改查询日期查询的字段
+                .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime.ToLocalTime())
+                .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime <= endTime.ToLocalTime())
+                .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Contains(workorderid))
+                .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Contains(partnumber))
                 .AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
                 .AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
                 .ToExpression();