20230530集团看板数据来源页面添加

SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs

@@ -45,7 +45,7 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, string personType, Grid Grid1)
         {
-            IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId);
+            IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists;
             if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
             {
                 getDataList = getDataList.Where(e => e.ProjectId == projetcId);
@@ -79,7 +79,7 @@ namespace BLL
             {
                 return null;
             }
-            getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+            getDataList = SortConditionHelper.SortingAndPaging(getDataList.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId), Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
             return from x in getDataList
                    select new
                    {
@@ -698,6 +698,7 @@ namespace BLL
                     InTime = person.InTime.HasValue ? person.InTime : DateTime.Now,
                     Isprint = "0",
                     States = person.States,
+                    IsSafetyMonitoring=person.IsSafetyMonitoring,
                 };
 
                 ////现场人员项目出入场记录
@@ -767,6 +768,7 @@ namespace BLL
                         newPerson.States = person.States;
                         setPersonItemInOut = true;
                     }
+                    newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring;
                     db.SubmitChanges();
 
                     if (!setPersonItemInOut)