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

2023-11-11

Browse Source
This commit is contained in:
李鹏飞
2023-11-11 16:02:42 +08:00
parent b2ffd4b8d0
commit 48dd589a7f
66 changed files with 2334 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+7 -11
View File
@@ -1,12 +1,8 @@
using Aspose.Words;
using BLL;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
namespace FineUIPro.Web.DataShow
{
@@ -44,7 +40,7 @@ namespace FineUIPro.Web.DataShow
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_CompanySafetyMeeting AS Meeting
LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId
where 1=1 ";
where Meeting.CompanySafetyMeetingDate > '2023-01-01' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtStartTime.Text))
{
@@ -72,7 +68,7 @@ namespace FineUIPro.Web.DataShow
,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
FROM Meeting_CompanySpecialMeeting AS Meeting
LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId
where 1=1 ";
where Meeting.CompanySpecialMeetingDate > '2023-01-01' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtStartTime.Text))
{
@@ -100,7 +96,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 (Project.ProjectState2 is null or Project.ProjectState2 !=9) ";
where Meeting.SafetyLeaderGroupMeetingDate > '2023-01-01' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{
@@ -134,14 +130,14 @@ 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 where (Project.ProjectState2 is null or Project.ProjectState2 !=9)
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
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 where (Project.ProjectState2 is null or Project.ProjectState2 !=9)) V
where 1=1 ";
LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V
where V.MeetingDate > '2023-01-01' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != Const._Null)
{