From f2397dc0090486d5b0373c5b8eecc9e7d6e3b4af Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 23 Oct 2025 10:35:47 +0800 Subject: [PATCH] 1 --- .../InspectionManagementService.cs | 54 +++++++++++-------- SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs | 1 + SGGL/FineUIPro.Web/index.aspx | 2 +- .../PublishProfiles/FolderProfile.pubxml.user | 22 ++++---- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 5 files changed, 47 insertions(+), 34 deletions(-) diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index 2ed2dba6..6d3bce58 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -318,15 +318,19 @@ namespace BLL List InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList(); if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0") { - InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.CNProfessionalId == cNProfessionalId).ToList(); } if (isOnceQualified == true) { - InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null && SoptDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { - InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); + } + if (SoptDate != null) + { + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; @@ -337,19 +341,23 @@ namespace BLL if (!string.IsNullOrEmpty(projectId)) { - InspectionMangementList = (from x in InspectionMangementList where x.ProjectId == projectId select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.ProjectId == projectId).ToList(); } if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0") { - InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.CNProfessionalId == cNProfessionalId).ToList(); } if (isOnceQualified == true) { - InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null && SoptDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { - InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); + } + if (SoptDate != null) + { + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; @@ -359,15 +367,19 @@ namespace BLL List InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList(); if (!string.IsNullOrEmpty(unitId) && unitId != "0") { - InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.UnitId == unitId).ToList(); } if (isOnceQualified == true) { - InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null && SoptDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { - InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); + } + if (SoptDate != null) + { + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; @@ -409,13 +421,13 @@ namespace BLL { InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); } if (SoptDate != null) { - InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate <= SoptDate || x.InspectionDate == null).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; } @@ -436,13 +448,13 @@ namespace BLL { InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); } if (SoptDate != null) { - InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate <= SoptDate || x.InspectionDate == null).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; @@ -459,13 +471,13 @@ namespace BLL { InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); } if (SoptDate != null) { - InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate <= SoptDate || x.InspectionDate == null).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; @@ -488,13 +500,13 @@ namespace BLL { InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList(); } - if (startDate != null) + if (startDate != null && startDate != Convert.ToDateTime("2015-01-01")) { InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList(); } if (SoptDate != null) { - InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate <= SoptDate || x.InspectionDate == null).ToList(); + InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList(); } return InspectionMangementList; diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index a71e1cbd..e411c3a7 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -485,6 +485,7 @@ namespace BLL var userIds = BLL.UserService.GetUserHaveEmailList(); //userIds = userIds.Where(x => x.UserName == "张邦兴" || x.UserName == "申银行").ToList(); + //userIds = userIds.Where(x => x.UserName == "白金潮" || x.UserName == "申银行").ToList(); if (userIds.Any() && lstOverdue.Any()) { //int allnum = 0; diff --git a/SGGL/FineUIPro.Web/index.aspx b/SGGL/FineUIPro.Web/index.aspx index 07829421..bfea0851 100644 --- a/SGGL/FineUIPro.Web/index.aspx +++ b/SGGL/FineUIPro.Web/index.aspx @@ -352,7 +352,7 @@