From 52638d8b108c8f93a0c423f5aefd82e355137ce7 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Wed, 23 Apr 2025 15:19:37 +0800 Subject: [PATCH] =?UTF-8?q?3=E3=80=81=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=EF=BC=8C=E7=8E=B0=E5=9C=BA=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E3=80=81=E6=9C=BA=E5=85=B7=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=A9=BF=E9=80=8F=E5=8F=AA=E7=9C=8B=E5=9C=A8=E5=BB=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs | 6 ++++-- SGGL/FineUIPro.Web/DataShow/License.aspx.cs | 5 ++++- SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs index a87bda58..b3eb6c1e 100644 --- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs @@ -40,14 +40,14 @@ namespace FineUIPro.Web.DataShow strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,IsUsed,CompileDate,EQType FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId - ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'特种设备' AS EQType + ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'特种设备' AS EQType,P.ProjectState FROM InApproveManager_EquipmentInItem AS Item LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId - ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType + ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType,P.ProjectState FROM InApproveManager_GeneralEquipmentInItem AS Item LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId @@ -56,6 +56,8 @@ namespace FineUIPro.Web.DataShow WHERE 1=1 "; strSql += " AND V.IsUsed = @IsUsed"; + //在建项目数据 + strSql += " AND (V.ProjectState = '1' OR V.ProjectState IS NULL)"; listStr.Add(new SqlParameter("@IsUsed", "1")); if (this.rbType.SelectedValue == "2") { diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs index 1ddd7b60..61a1c334 100644 --- a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs @@ -40,8 +40,11 @@ namespace FineUIPro.Web.DataShow strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName,V.IsHighRisk ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.WorkStatesStr,V.LicenseTypeId,V.UnitId,V.LicenseManageContents ,V.CompileMan,V.CompileDate,V.States,V.UserName - FROM View_License_LicenseManager AS V + FROM View_License_LicenseManager AS V + LEFT JOIN Base_Project AS Project ON V.ProjectId =Project.ProjectId WHERE 1=1"; + //在建项目数据 + strSql += " AND (Project.ProjectState = '1' OR Project.ProjectState IS NULL)"; if (this.rbType.SelectedValue=="2") { strSql += " AND V.WorkStates = @WorkStates"; diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs index 9c07b6b2..571ee42e 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs @@ -41,6 +41,8 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) "; + //在建项目数据 + strSql += " AND (Project.ProjectState = '1' OR Project.ProjectState IS NULL)"; List listStr = new List(); if (this.drpProject.SelectedValue !=Const._Null) {