From 6b5fb3a86548d1d3207d998356be804ba26b3f0e Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 24 Jan 2024 15:56:52 +0800 Subject: [PATCH] =?UTF-8?q?20240124=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=8A=E6=8A=A5=E9=9B=86=E5=9B=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InterFaceService/InterFaceLogService .cs | 38 +++++++++---------- .../Project_HSSEData_HSSEService.cs | 12 ++++-- .../DataShow/SecurityRisk.aspx.cs | 3 +- .../TaskScheduling/InterFace/IFLogList.aspx | 28 +++++++------- .../InterFace/IFLogList.aspx.designer.cs | 9 +++++ .../InterFace/InterFaceSet.aspx | 2 +- .../InterFace/InterFaceTask.aspx | 2 +- 7 files changed, 55 insertions(+), 39 deletions(-) diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs index 073b2938..353ace12 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs @@ -29,25 +29,25 @@ namespace BLL get; set; } - public static List GetInterFaceLogByModle(Model.InterFaceLog table) - { - var q= from x in db.InterFaceLog - where - ( string.IsNullOrEmpty(table.InterFaceLogId)||x.InterFaceLogId.Contains(table.InterFaceLogId)) && - ( string.IsNullOrEmpty(table.UserId)||x.UserId.Contains(table.UserId)) && - ( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) && - ( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) && - ( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) && - ( string.IsNullOrEmpty(table.InterFaceMehtod)||x.InterFaceMehtod.Contains(table.InterFaceMehtod)) && - ( string.IsNullOrEmpty(table.InterFaceBody)||x.InterFaceBody.Contains(table.InterFaceBody)) && - ( string.IsNullOrEmpty(table.InterFaceReturnData)||x.InterFaceReturnData.Contains(table.InterFaceReturnData)) && - ( string.IsNullOrEmpty(table.InterFaceType)||x.InterFaceType.Contains(table.InterFaceType)) && - ( string.IsNullOrEmpty(table.IP)||x.IP.Contains(table.IP)) - orderby x.InterFaceLogDate descending - select x - ; - - return q.ToList(); + public static List GetInterFaceLogByModle(Model.InterFaceLog table) + { + var q = from x in db.InterFaceLog + where + (string.IsNullOrEmpty(table.InterFaceLogId) || x.InterFaceLogId.Contains(table.InterFaceLogId)) && + (string.IsNullOrEmpty(table.UserId) || x.UserId.Contains(table.UserId)) && + (string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) && + (string.IsNullOrEmpty(table.InterFaceName) || x.InterFaceName.Contains(table.InterFaceName)) && + (string.IsNullOrEmpty(table.InterFaceUrl) || x.InterFaceUrl.Contains(table.InterFaceUrl)) && + (string.IsNullOrEmpty(table.InterFaceMehtod) || x.InterFaceMehtod.Contains(table.InterFaceMehtod)) && + (string.IsNullOrEmpty(table.InterFaceBody) || x.InterFaceBody.Contains(table.InterFaceBody)) && + (string.IsNullOrEmpty(table.InterFaceReturnData) || x.InterFaceReturnData.Contains(table.InterFaceReturnData)) && + (string.IsNullOrEmpty(table.InterFaceType) || x.InterFaceType.Contains(table.InterFaceType)) && + (string.IsNullOrEmpty(table.IP) || x.IP.Contains(table.IP)) + orderby x.InterFaceLogDate descending + select x + ; + + return q.ToList(); } /// 获取分页列表 diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index ee27a6ef..7fbb5bec 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -1355,7 +1355,8 @@ namespace BLL { var result = (from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 2 + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 2 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } @@ -1368,7 +1369,8 @@ namespace BLL { var result = (from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 1 + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 1 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } @@ -1381,7 +1383,8 @@ namespace BLL { var result = (from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 3 + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 3 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } @@ -1394,7 +1397,8 @@ namespace BLL { var result = (from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 4 + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 4 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs index 52fbf7ea..6f06481e 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs @@ -235,7 +235,7 @@ namespace FineUIPro.Web.DataShow count = (from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2 - + && y.CompileDate.Value.Year >= 2023 select x).Count(); } else @@ -243,6 +243,7 @@ namespace FineUIPro.Web.DataShow count = (from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2 + && y.CompileDate.Value.Year >= 2023 select x).Count(); } return count; diff --git a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx index dae759f9..a5eea11a 100644 --- a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx +++ b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx @@ -24,10 +24,10 @@ - <%-- --%> <%-- --%> - - - - - - - - + + + + + - - diff --git a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx.designer.cs b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx.designer.cs index fb1941da..7d990fcc 100644 --- a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.InterFace /// protected global::System.Web.UI.WebControls.Label Label1; + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + /// /// Label4 控件。 /// diff --git a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx index 429f3687..2993c933 100644 --- a/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx +++ b/SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx @@ -120,7 +120,7 @@