1

SGGL/BLL/API/APIPersonService.cs

@@ -377,7 +377,8 @@ namespace BLL
                 // 默认只返回在岗人员
                 query = query.Where(x => x.States == Const.ProjectPersonStates_1);
 
-                var persons = from x in query orderby x.CardNo descending
+                var persons = from x in query
+                              orderby x.CardNo descending
                               select new Model.ProjectPersonOutput
                               {
                                   PersonId = x.PersonId,
@@ -559,7 +560,7 @@ namespace BLL
         /// <param name="workPostIds">培训岗位ID</param>
         /// <param name="trainTypeId">培训类型ID</param>
         /// <returns></returns>
-        public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, string name)
+        public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, string name, string startDate, string endDate)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
@@ -585,6 +586,7 @@ namespace BLL
                                      TeamGroupName = x.TeamGroupName,
                                      WorkPostId = x.WorkPostId,
                                      WorkPostName = x.WorkPostName,
+                                     InTimeValue = x.InTime,
                                      InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
                                      OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
                                      OutResult = x.OutResult,
@@ -608,7 +610,14 @@ namespace BLL
                 {
                     getPersons = getPersons.Where(x => x.PersonName.Contains(name));
                 }
-
+                if (!string.IsNullOrEmpty(startDate))
+                {
+                    getPersons = getPersons.Where(x => x.InTimeValue >= Funs.GetNewDateTime(startDate));
+                }
+                if (!string.IsNullOrEmpty(endDate))
+                {
+                    getPersons = getPersons.Where(x => x.InTimeValue <= Funs.GetNewDateTime(endDate));
+                }
                 List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>();
                 var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId);
                 if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false))

SGGL/Model/APIItem/HSSE/PersonItem.cs

@@ -97,6 +97,10 @@ namespace Model
         /// </summary>
         public string InTime { get; set; }
         /// <summary>
+        /// 入场时间
+        /// </summary>
+        public DateTime? InTimeValue { get; set; }
+        /// <summary>
         /// 出场时间
         /// </summary>
         public string OutTime { get; set; }

SGGL/WebAPI/Controllers/PersonController.cs

@@ -382,7 +382,7 @@ namespace WebAPI.Controllers
         /// <param name="trainTypeId">培训类型ID(可为空)</param>
         /// <param name="pageIndex">分页</param>
         /// <returns></returns>
-        public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex)
+        public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex, string startDate, string endDate)
         {
             var responeData = new Model.ResponeData();
             try