lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2025-03-27 15:23:34 +08:00
parent b10af2e331 cd8148326c
commit 6eb3e01c1b
24 changed files with 366 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+4 -4
View File
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow
from EduTrain_TrainRecord AS TrainRecord
LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId
LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId
where Project.ProjectState ='1'
UNION ALL
select
@@ -91,7 +91,7 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName
From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1 ";
)f WHERE 1=1 and Project.ProjectState ='1' ";
#region 总数
var strSqlSum = @"select Count(*)as allCount from(
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.DataShow
from EduTrain_TrainRecord AS TrainRecord
LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId
LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId
where Project.ProjectState ='1'
UNION ALL
select
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.DataShow
TrainDepart as UnitName
From Bo_Sheng_Train F
LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId
)f WHERE 1=1";
)f WHERE 1=1 and Project.ProjectState ='1'" ;
#endregion
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs
+1 -1
View File
@@ -41,7 +41,7 @@ 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 Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) ";
where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and Project.ProjectState ='1'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs
+1 -1
View File
@@ -41,7 +41,7 @@ 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 Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') ";
where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') and Project.ProjectState ='1'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs
+1 -1
View File
@@ -41,7 +41,7 @@ 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 Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' ";
where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' and Project.ProjectState ='1'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+1 -1
View File
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
FROM SitePerson_Person AS Person
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 ";
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 and Project.ProjectState ='1'";
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";
SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
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()) ";
WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) and Project.ProjectState ='1' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{