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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2771,6 +2771,20 @@ FROM
             try
             {
                 users = JsonConvert.DeserializeObject<List<string>>(ssd.Remark);
+                var groupModuleOperators = GeneralMethod.GetGroupModuleOperators(dto.diid);
+
+                //添加分配人员
+                // 79	车/导游地接
+                // 80	签证
+                // 81	邀请/公务活动
+                var setdataids = new List<int>() { 79, 81 };
+                foreach (var groupModule in groupModuleOperators)
+                {
+                    if (setdataids.Contains(groupModule.CTableId))
+                    {
+                        users.AddRange(groupModule.OperationUsers.Select(x => x.UserId.ToString()));
+                    }
+                }
                 var res = await AppNoticeLibrary.SendUserMsg_BaoPi_ToUser(users, diid);
 
                 //消息通知成功 更改团组step、记录日志

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1154,6 +1154,50 @@ namespace OASystem.API.OAMethodLib
                 }).Distinct().ToList();
             view.Where(it => it.CTableId == 98).FirstOrDefault().OperationUsers = otherUsers;
 
+            //添加分配人员
+            // 79	车/导游地接
+            // 80	签证
+            // 81	邀请/公务活动
+            var setdataids = new List<int>() { 79, 81 };
+
+            // 27	商邀
+            // 28	OP
+            var jobSetdataids = new List<int>() { 27, 28 };
+
+            var q = _sqlSugar.Queryable<Grp_GroupsTaskAssignment, Sys_Users>(
+            (ccta, su) => new JoinQueryInfos(
+                JoinType.Left, ccta.UId == su.Id && su.IsDel == 0))
+            .Where((ccta, su) =>
+                    ccta.IsDel == 0 &&
+                    ccta.DIId == groupId &&
+                    jobSetdataids.Contains(su.JobPostId) &&
+                    setdataids.Contains(ccta.CTId))
+            .Select((ccta, su) => new
+            {
+                userid = su.Id,
+                su.JobPostId,
+                ccta.CTId,
+                ccta.DIId,
+                su.CnName,
+            });
+
+            var qtb = q.ToDataTable();
+
+            foreach (var groupModule in view)
+            {
+                if (setdataids.Contains(groupModule.CTableId) && !groupModule.OperationUsers.Any())
+                {
+                    var qtbUsers = qtb.AsEnumerable().
+                        Where(x => x.Field<int>("CTId") == groupModule.CTableId).
+                        Select(x => x.Field<int>("userid")).ToList();
+                    groupModule.OperationUsers = qtbUsers.Select(x => new GeneralMethod.GroupOperationUserInfo()
+                    {
+                        UserId = x,
+                        UserName = qtb.AsEnumerable().FirstOrDefault(y => y.Field<int>("userid") == x)?.Field<string>("CnName") ?? ""
+                    }).ToList();
+                }
+            }
+
             return view;
         }
 
@@ -5776,7 +5820,7 @@ namespace OASystem.API.OAMethodLib
         #endregion
         #endregion
 
-        
+
         #region Excel导出服务
         #region 类
         public class FileExportSettings
@@ -6148,7 +6192,7 @@ namespace OASystem.API.OAMethodLib
         {
             try
             {
-                var basePath ="wwwroot/exports/exports";
+                var basePath = "wwwroot/exports/exports";
                 var folderPath = Path.Combine(basePath, subFolder);
                 Directory.CreateDirectory(folderPath);