20210807

SGGL/BLL/HSSE/SitePerson/PersonService.cs

@@ -35,7 +35,7 @@ namespace BLL
         /// <param name="PageSize">每页数量</param>
         /// <returns></returns>
         public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
-                    bool ckTrain, bool ckIspost, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1)
+                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, Grid Grid1)
         {
             IQueryable<Model.View_SitePerson_Person> getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
             if (!string.IsNullOrEmpty(unitId))
@@ -69,11 +69,16 @@ namespace BLL
             {
                 getPersonList = getPersonList.Where(x => x.TrainCount == 0);
             }
-            if (ckIspost)
+            if (postType =="0")
             {
                 getPersonList = getPersonList.Where(x => x.IsUsed == false || x.InTime.Value > DateTime.Now
                                 || (x.OutTime.HasValue && x.OutTime < DateTime.Now));
             }
+            else if (postType == "1")
+            {
+                getPersonList = getPersonList.Where(x => x.IsUsed == true && x.InTime <=DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value >DateTime.Now));
+            }
+
             if (ckJT)
             {
                 getPersonList = getPersonList.Where(x => x.RealNameAddTime == null);