gaofei
/
SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei:42b6dc4641e3bbfccb214b8870c532c234e6d7d4
Branches Tags
gaofei:master
..
compare: gaofei:8089cbac4793d78cd708980ba06067c10e9325d8
Branches Tags
gaofei:master

No commits in common. "42b6dc4641e3bbfccb214b8870c532c234e6d7d4" and "8089cbac4793d78cd708980ba06067c10e9325d8" have entirely different histories.
42b6dc4641 ... 8089cbac47

3 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
SGGL/BLL/API/APIProjectService.cs
View File

@ -8,12 +8,12 @@ namespace BLL
public static class APIProjectService
{
#region 获取所有项目列表
public static List<Model.ProjectItem> geProjects(string status = "1")
public static List<Model.ProjectItem> geProjects()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
return (from x in db.Base_Project where x.ProjectState == status
return (from x in db.Base_Project
select new Model.ProjectItem()
{
ProjectId = x.ProjectId,

5
SGGL/WebAPI/Controllers/HSSE/MeetingController.cs
View File

@ -177,7 +177,7 @@ namespace WebAPI.Controllers
#endregion
#region 公司级班前会人员统计
public Model.ResponeData getCompanyMeetingPersonCounts( string meetingDate,string status="1")
public Model.ResponeData getCompanyMeetingPersonCounts( string meetingDate)
{
var responeData = new Model.ResponeData();
try
@ -185,13 +185,12 @@ 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 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 FROM [dbo].[Base_Project] as p;";
DateTime mdate = Funs.GetNewDateTimeOrNow(meetingDate);
List<SqlParameter> listStr = new List<SqlParameter>();
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);

4
SGGL/WebAPI/Controllers/ProjectController.cs
View File

@ -14,12 +14,12 @@ namespace WebAPI.Controllers
public class ProjectController : ApiController
{
#region
public Model.ResponeData getALLProjects(string status = "1")
public Model.ResponeData getALLProjects()
{
Model.ResponeData responeData = new Model.ResponeData();
try
{
List<Model.ProjectItem> projectList = BLL.APIProjectService.geProjects(status);
List<Model.ProjectItem> projectList = BLL.APIProjectService.geProjects();
responeData.data = projectList;
}
catch (Exception ex)