lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20231030项目

Browse Source
This commit is contained in:
杨红卫
2023-10-30 11:13:57 +08:00
parent b3a0193a38
commit 5e30bb0f56
36 changed files with 392 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+5 -5
View File
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
}
@@ -96,7 +96,7 @@ namespace FineUIPro.Web.DataShow
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_SafetyLeaderGroupMeeting AS Meeting
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -127,15 +127,15 @@ namespace FineUIPro.Web.DataShow
{
string strSql = @"SELECT ProjectId,ProjectName, ID, MeetingName, MeetingDate,MeetingHours,HostMan,AttentPersonNum,AttentPerson
FROM (SELECT Project.ProjectId,Project.ProjectName,Meeting.MonthMeetingId AS ID,Meeting.MonthMeetingName AS MeetingName,Meeting.MonthMeetingDate AS MeetingDate,Meeting.MeetingHours
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow
FROM Meeting_MonthMeeting AS Meeting
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId
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
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow
FROM Meeting_WeekMeeting AS Meeting
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V
where 1=1 ";
where IsCNCECShow=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{