zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

穿透项目加状态

Browse Source
This commit is contained in:
李超
2023-11-02 15:40:43 +08:00
parent bfb4cdc428
commit 48a0808bfb
24 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+2 -2
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
WHERE 1=1 ";
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
if (rbType.SelectedValue == "0")
{
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId
WHERE 1 = 1 ";
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
if (rbType.SelectedValue == "2")
{
strSql += " AND Record.AccidentDegree ='1'";
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+4 -4
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM dbo.Supervise_SuperviseCheckReport AS S"
+ @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId"
+ @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId"
+ @" WHERE 1=1 ";
+ @" WHERE (P.ProjectState2 is null or P.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND S.CheckType= @CheckType";
listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue));
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.DataShow
,CheckTeam= STUFF((SELECT ',' + UserName FROM dbo.Sys_User where PATINDEX('%,' + RTRIM(UserId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'')
from Check_ProjectLeaderCheck AS C
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
where 1=1 ";
where (P.ProjectState2 is null or P.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -109,7 +109,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
LEFT JOIN Sys_User AS U ON C.CheckManId=U.UserId
LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId
where 1=1 ";
where (P.ProjectState2 is null or P.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -142,7 +142,7 @@ namespace FineUIPro.Web.DataShow
,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'')
from Check_CheckSpecial AS C
LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
where 1=1 ";
where (P.ProjectState2 is null or P.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+2 -2
View File
@@ -45,14 +45,14 @@ namespace FineUIPro.Web.DataShow
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
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId where (P.ProjectState2 is null or P.ProjectState2 !=9)
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
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
LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId where (P.ProjectState2 is null or P.ProjectState2 !=9)) V
WHERE 1=1 ";
strSql += " AND V.IsUsed = @IsUsed";
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+1 -1
View File
@@ -41,7 +41,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 1=1 ";
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
strSql += " AND TrainType.TrainType =@TrainType";
listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
FROM CH_CheckItem AS Item
LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId
WHERE 1=1 ";
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
+1 -1
View File
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.WED_Unit
LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId
WHERE (Welder.WederType='1' OR Welder.WederType is null) AND Welder.ProjectId IS NOT NULL";
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) and (Welder.WederType='1' OR Welder.WederType is null) AND Welder.ProjectId IS NOT NULL ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue !=Const._Null)
{
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (ProjectState2 is null or ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (ProjectState2 is null or ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (ProjectState2 is null or ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+3 -3
View File
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.DataShow
FROM Meeting_SafetyLeaderGroupMeeting AS Meeting
LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId
where 1=1 ";
where (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -134,13 +134,13 @@ namespace FineUIPro.Web.DataShow
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_MonthMeeting AS Meeting
LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId where (Project.ProjectState2 is null or Project.ProjectState2 !=9)
union all
SELECT Project.ProjectId,Project.ProjectName,Meeting.WeekMeetingId AS ID,Meeting.WeekMeetingName AS MeetingName,Meeting.WeekMeetingDate AS MeetingDate,Meeting.MeetingHours
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_WeekMeeting AS Meeting
LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId where (Project.ProjectState2 is null or Project.ProjectState2 !=9)) V
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+ @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
+ @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) ";
+ @" WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) and (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.ckState.SelectedValue != "0")
SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.DataShow
,(SELECT COUNT(*) FROM WBS_DivisionProject AS D WHERE D.ProjectId =P.ProjectId AND D.SubItemType= '3') AS count4
,(SELECT COUNT(*) FROM WBS_BreakdownProject AS E WHERE E.ProjectId =P.ProjectId ) AS count5
FROM Base_Project AS P
WHERE P.ProjectState = 1 ";
WHERE P.ProjectState = 1 and (P.ProjectState2 is null or P.ProjectState2 !=9) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/ProjectPerson.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 (Project.ProjectState2 is null or Project.ProjectState2 !=9) AND IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue !=Const._Null)
{
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
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 WorkPost.IsCQMS=1 ";
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 and (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND Person.ProjectId = @ProjectId";
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.DataShow
FROM CostGoods_CostSmallDetail as cost
left join Base_Project as p on cost.ProjectId =p.ProjectId
left join Base_Unit as Unit on cost.UnitId =Unit.UnitId
WHERE 1=1";
WHERE (p.ProjectState2 is null or p.ProjectState2 !=9) ";
if (this.drpProject.SelectedValue != Const._Null)
{
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where (ProjectState2 is null or ProjectState2 !=9) and ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)