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/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)