diff --git a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs index 719f721..5ef628c 100644 --- a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs @@ -185,7 +185,7 @@ namespace WebAPI.Controllers using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - string sql = "SELECT p.ProjectId as projectId, p.ProjectName as projectName,(SELECT count(*) FROM [dbo].[Project_ProjectUser] as pu LEFT JOIN [dbo].[Sys_User] as u on u.UserId = pu.UserId WHERE pu.ProjectId = p.ProjectId) as manager,(SELECT SUM(AttentPersonNum) as cpunt FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day) as personCount, (SELECT TOP 1 [Declare] FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day AND [Declare] IS NOT NULL ORDER BY ClassMeetingDate DESC) AS [Declare] FROM [dbo].[Base_Project] as p where p.ProjectState = @projectState;"; + string sql = "SELECT p.ProjectId as projectId, p.ProjectName as projectName,(SELECT count(*) FROM [dbo].[Project_ProjectUser] as pu LEFT JOIN [dbo].[Sys_User] as u on u.UserId = pu.UserId WHERE pu.ProjectId = p.ProjectId) as manager,(SELECT SUM(AttentPersonNum) as cpunt FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day) as personCount, (SELECT STRING_AGG(mc.[Declare], '。') WITHIN GROUP (ORDER BY mc.ClassMeetingDate DESC) FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day AND [Declare] IS NOT NULL) AS [Declare] FROM [dbo].[Base_Project] as p where p.ProjectState = @projectState;"; DateTime mdate = Funs.GetNewDateTimeOrNow(meetingDate); List listStr = new List(); listStr.Add(new SqlParameter("@year", mdate.Year));