diff --git a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
index e40e15e6..376b530c 100644
--- a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
+++ b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
@@ -1,4 +1,8 @@
-using System.Linq;
+using FineUIPro;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
namespace BLL
{
@@ -9,6 +13,62 @@ namespace BLL
{
public static Model.SGGLDB db = Funs.DB;
+ #region 获取安全巡检列表信息
+ ///
+ /// 记录数
+ ///
+ public static int count
+ {
+ get;
+ set;
+ }
+
+ ///
+ /// 定义变量
+ ///
+ private static IQueryable getDataLists = from x in db.SitePerson_Person
+ select x;
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static IEnumerable getListData(string projectId, string personName, Grid Grid1)
+ {
+ IQueryable getDataList = getDataLists;
+ if (!string.IsNullOrEmpty(projectId))
+ {
+ getDataList = getDataList.Where(e => e.ProjectId == projectId);
+ }
+ if (!string.IsNullOrEmpty(personName))
+ {
+ getDataList = getDataList.Where(e => e.PersonName.Contains(personName));
+ }
+
+ count = getDataList.Count();
+ if (count == 0)
+ {
+ return null;
+ }
+ getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+ return from x in getDataList
+ select new
+ {
+ x.ProjectId,
+ ProjectName = db.Base_Project.First(p => p.ProjectId == x.ProjectId).ProjectName,
+ x.UnitId,
+ UnitName = db.Base_Unit.First(p => p.UnitId == x.UnitId).UnitName,
+ x.SitePersonId,
+ x.PersonId,
+ x.CardNo,
+ x.PersonName,
+ };
+ }
+ #endregion
+
///
/// 根据主键获取体检管理
///
diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index 160519a8..7239b9f4 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -1,6 +1,7 @@
namespace BLL
{
using Model;
+ using NPOI.Util;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -361,17 +362,20 @@
group x by x.ProjectId into g
select new { g.First().ProjectId, count = g.Count() }).Distinct();
- List getList = new List();
+
if (getProjects.Count() > 0)
{
- getList = (from x in getProjects
- join y in pcount on x.ProjectId equals y.ProjectId into PP
- from p in PP.DefaultIfEmpty()
- orderby p.count descending
- select x).ToList();
+ var getList = (from x in getProjects
+ join y in pcount on x.ProjectId equals y.ProjectId into PP
+ from p in PP.DefaultIfEmpty()
+ orderby p.count descending
+ select x);
+ return getList.ToList();
}
-
- return getList;
+ else
+ {
+ return null;
+ }
}
}
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
index b3c4226d..1df17a02 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
@@ -137,7 +137,6 @@
+