diff --git a/SGGL/BLL/API/APIProjectService.cs b/SGGL/BLL/API/APIProjectService.cs index bec9f39..a3aa3cb 100644 --- a/SGGL/BLL/API/APIProjectService.cs +++ b/SGGL/BLL/API/APIProjectService.cs @@ -8,12 +8,12 @@ namespace BLL public static class APIProjectService { #region 获取所有项目列表 - public static List geProjects() + public static List geProjects(string status = "1") { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - return (from x in db.Base_Project + return (from x in db.Base_Project where x.ProjectState == status select new Model.ProjectItem() { ProjectId = x.ProjectId, diff --git a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs index 20dcf3b..6a0874f 100644 --- a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs @@ -177,7 +177,7 @@ namespace WebAPI.Controllers #endregion #region 公司级班前会人员统计 - public Model.ResponeData getCompanyMeetingPersonCounts( string meetingDate) + public Model.ResponeData getCompanyMeetingPersonCounts( string meetingDate,string status="1") { var responeData = new Model.ResponeData(); try @@ -185,12 +185,13 @@ 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 FROM [dbo].[Base_Project] as p;"; + 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 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)); listStr.Add(new SqlParameter("@month", mdate.Month)); listStr.Add(new SqlParameter("@day", mdate.Day)); + listStr.Add(new SqlParameter("@projectState", status)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter); diff --git a/SGGL/WebAPI/Controllers/ProjectController.cs b/SGGL/WebAPI/Controllers/ProjectController.cs index 7759162..280c5ff 100644 --- a/SGGL/WebAPI/Controllers/ProjectController.cs +++ b/SGGL/WebAPI/Controllers/ProjectController.cs @@ -14,12 +14,12 @@ namespace WebAPI.Controllers public class ProjectController : ApiController { #region - public Model.ResponeData getALLProjects() + public Model.ResponeData getALLProjects(string status = "1") { Model.ResponeData responeData = new Model.ResponeData(); try { - List projectList = BLL.APIProjectService.geProjects(); + List projectList = BLL.APIProjectService.geProjects(status); responeData.data = projectList; } catch (Exception ex)