Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -3809,6 +3809,20 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return Ok(await AiPerformanceAnalysis_TaskAllocationAsync(userId, start, end, createUserId, 1474));
         }
 
+        /// <summary>
+        /// 人事部员工分析
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <param name="createUserId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<IActionResult> AiPerformanceAnalysis_HumanResourceDepartmentAsync(int userId, DateTime start, DateTime end, int createUserId)
+        {
+            return Ok(await AiPerformanceAnalysis_TaskAllocationAsync(userId, start, end, createUserId, 1486));
+        }
+
         /// <summary>
         /// 任务分配分析
         /// </summary>
@@ -3875,11 +3889,11 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
 					    Where
 					      ta.IsDel = 0 
                            and ta.PredictEndTime  >= '{2}'
-                           and ta.PredictEndTime  <= '{3}'
+                           and ta.PredictEndTime  < '{3}'
 					  ) As temp
 					WHERE
 					  [CreateUserName] like '%{0}%'
-					  OR [Participant] like '%{1}%'", user_entity.CnName, user_entity.CnName, start.ToString("yyyy-MM-dd HH:mm:ss"), end.ToString("yyyy-MM-dd HH:mm:ss"));
+					  OR [Participant] like '%{1}%'", user_entity.CnName, user_entity.CnName, start.ToString("yyyy-MM-dd HH:mm:ss"), end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss"));
 
             var _view = await _sqlSugar
                     .SqlQueryable<TaskListView>(sql)