团组任务分配

默认要给财务三人分收款退还；超支费用除了财务外，国交所有人员均有这版块权限(已处理)

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -591,7 +591,7 @@ namespace OASystem.API.Controllers
                         var userInfo = _usersRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0 && it.Id == dto.UserId).First();
                         if (userInfo != null) createGroupUser = userInfo.CnName;
 
-                        string title = $"";
+                        string title = $"系统通知";
                         string content = $"团组[{groupName}(创建人:{createGroupUser})]创建成功,请前往页面进行下一步操作!";
                         await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.GroupBusinessOperations, title, content, userIds, diId);
                     }
@@ -673,7 +673,7 @@ namespace OASystem.API.Controllers
                         var userInfo = _usersRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0 && it.Id == dto.UserId).First();
                         if (userInfo != null) createGroupUser = userInfo.CnName;
 
-                        string title = $"";
+                        string title = $"系统通知";
                         string content = $"团组[{groupName}(创建人:{createGroupUser})]创建成功,请前往页面进行下一步操作!";
                         await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.GroupBusinessOperations, title, content, userIds, diId);
                     }

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -529,7 +529,7 @@ namespace OASystem.API.OAMethodLib
         }
 
         /// <summary>
-        /// 团组汇率 
+        /// 团组任务分配 
         /// 建团时 默认按照岗位分配权限
         /// </summary>
         /// <param name="userId"></param>
@@ -583,7 +583,8 @@ namespace OASystem.API.OAMethodLib
              * 82  团组客户保险 --> 国交部 经理,主管 岗位
              * 85  机票预订  --> 国交部门 机票 岗位
              * 98  其他款项  --> 总经办部门 总经理 岗位/国交部门(ALL) 岗位/财务部门(ALL) 岗位/策划部门(ALL) 岗位/人事部门 采购 岗位
-             * 1015 超支费用  --> 财务部门(ALL)岗位
+             * 1015 超支费用,69 收款退还  --> 财务部门(ALL)岗位
+             * 1015 超支费用  --> 国交部(ALL)岗位
              */
             List<Grp_GroupsTaskAssignment> _GroupsTaskAssignments = new List<Grp_GroupsTaskAssignment>();
             // 76  酒店预订  --> 国交部门(7) 酒店(25) 岗位 
@@ -694,7 +695,7 @@ namespace OASystem.API.OAMethodLib
                     }).ToList()
             );
 
-            //1015 超支费用  --> 财务部门(3)(ALL)岗位
+            //1015 超支费用,285 收款退还  --> 财务部门(ALL)岗位
             _GroupsTaskAssignments.AddRange(
                 userDatas
                 .Where(it => it.DepId == 3)
@@ -707,6 +708,31 @@ namespace OASystem.API.OAMethodLib
                 }).ToList()
             );
 
+            _GroupsTaskAssignments.AddRange(
+               userDatas
+               .Where(it => it.DepId == 3)
+               .Select(it => new Grp_GroupsTaskAssignment()
+               {
+                   DIId = diId,
+                   CTId = 285,
+                   UId = it.Id,
+                   CreateUserId = userId
+               }).ToList()
+           );
+
+            //1015 超支费用  --> 国交部(ALL)岗位
+            _GroupsTaskAssignments.AddRange(
+              userDatas
+              .Where(it => it.DepId == 7)
+              .Select(it => new Grp_GroupsTaskAssignment()
+              {
+                  DIId = diId,
+                  CTId = 1015,
+                  UId = it.Id,
+                  CreateUserId = userId
+              }).ToList()
+          );
+
             if (_GroupsTaskAssignments.Count > 0)
             {
                 var addId =_teamRateRep._sqlSugar.Insertable(_GroupsTaskAssignments).ExecuteCommand();

OASystem/OASystem.Domain/Entities/Financial/Fin_ForeignReceivables.cs

@@ -87,7 +87,7 @@ namespace OASystem.Domain.Entities.Financial
 
         /// <summary>
         /// 添加方式   
-        /// 0 - 账单页面添加   1 - 预算成本页面添加
+        /// 0 - 账单模块   1 - 成本预算模块
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int AddingWay { get; set; }

OASystem/OASystem.Domain/ViewModels/Financial/Fin_ForeignReceivablesView.cs

@@ -204,7 +204,7 @@ namespace OASystem.Domain.ViewModels.Financial
 
         /// <summary>
         /// 添加方式   
-        /// 0 - 账单页面添加   1 - 预算成本页面添加
+        /// 0 - 账单模块   1 - 预算成本页面添加
         /// </summary>
         public int AddingWay { get; set; }