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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -564,6 +564,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 接团流程操作(增改)
+        /// 安卓端使用 建团时添加客户名单
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -600,7 +601,31 @@ namespace OASystem.API.Controllers
                 if (dto.Status == 1) //添加
                 {
                     diId = groupData.Data;
+                    //添加默认币种
                     await GeneralMethod.PostGroupRateAddInit(dto.UserId, diId);
+
+                    //默认分配权限
+                    await GeneralMethod.PostGroupAuthAddInit(dto.UserId, diId);
+
+                    //消息提示 王鸽 主管号
+                    List<int> _managerIds = new List<int>() { 22, 32 };
+                    var userIds = _usersRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0 && _managerIds.Contains(it.JobPostId)).Select(it => it.Id).ToList();
+                    if (userIds.Count > 0)
+                    {
+                        userIds.Add(208);
+                        //创建团组管控
+                        GroupStepForDelegation.CreateWorkStep(diId);
+                        //发送消息
+                        string groupName = dto.TeamName;
+                        string createGroupUser = string.Empty;
+
+                        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 content = $"团组[{groupName}(创建人:{createGroupUser})]创建成功,请前往页面进行下一步操作!";
+                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.GroupBusinessOperations, title, content, userIds, diId);
+                    }
                 }
 
 
@@ -632,53 +657,6 @@ namespace OASystem.API.Controllers
             }
         }
 
-        /// <summary>
-        /// 建团添加默认工作人员团组权限测试
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> PostGroupAuthAddInit(int userId, int diId)
-        {
-            try
-            {
-                GeneralMethod.PostGroupAuthAddInit(userId, diId);
-
-                return Ok(JsonView(true));
-            }
-            catch (Exception ex)
-            {
-
-                Logs(ex.Message);
-                return Ok(JsonView(false, ex.Message));
-            }
-        }
-
-
-        /// <summary>
-        /// 建团添加默认币种测试
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GroupOperation11(int userId, int diId)
-        {
-            try
-            {
-                GeneralMethod.PostGroupRateAddInit(userId, diId);
-
-                return Ok(JsonView(true));
-            }
-            catch (Exception ex)
-            {
-
-                Logs(ex.Message);
-                return Ok(JsonView(false, ex.Message));
-            }
-        }
-
         /// <summary>
         /// 接团信息 操作(删除)
         /// </summary>
@@ -1502,7 +1480,7 @@ namespace OASystem.API.Controllers
                             break;
                         case 82: //团组客户保险
 
-                            Grp_Customers customers = _Customers.Where(s => s.Id == entity.Id && s.IsDel == 0).FirstOrDefault();
+                            Grp_Customers customers = _Customers.Where(s => s.Id == entity.CId && s.IsDel == 0).FirstOrDefault();
                             if (customers != null)
                             {
                                 _detail.PriceNameContent = getClientNameStr(clientNameList, customers.ClientName);
@@ -1901,6 +1879,7 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
+        
         /// <summary>
         /// 根据舱位类型查询接团客户名单信息
         /// </summary>

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -421,12 +421,15 @@ namespace OASystem.API.OAMethodLib
                     );
             }
 
-            var res = _teamRateRep._sqlSugar.Insertable(grp_TeamRates).ExecuteCommand();
-            if (res < 1)
+            if (grp_TeamRates.Count > 0)
             {
+                var addId = _teamRateRep._sqlSugar.Fastest<Grp_TeamRate>().PageSize(100000).BulkCopy(grp_TeamRates);
+                if (addId < 1)
+                {
 
-                result.Msg = string.Format(@"添加失败!");
-                return result;
+                    result.Msg = string.Format(@"添加失败!");
+                    return result;
+                }
             }
 
             result.Code = 0;
@@ -482,6 +485,7 @@ namespace OASystem.API.OAMethodLib
 
             /*
              * 76  酒店预订  --> 国交部门 酒店 岗位
+             * 77  行程  --> 国交部门 经理,主管 岗位
              * 79  车/导游地接  --> 国交部门 OP 岗位
              * 80  签证  --> 国交部门 签证 岗位
              * 81  邀请/公务活动 --> 国交部门 商邀 岗位
@@ -504,6 +508,19 @@ namespace OASystem.API.OAMethodLib
                 }).ToList()
             );
 
+            // 77  行程  --> 国交部门(7) 经理(32),主管(22) 岗位
+            _GroupsTaskAssignments.AddRange(
+                userDatas
+                .Where(it => it.DepId == 7 && (it.JobPostId == 22 || it.JobPostId == 32))
+                .Select(it => new Grp_GroupsTaskAssignment()
+                {
+                    DIId = diId,
+                    CTId = 77,
+                    UId = it.Id,
+                    CreateUserId = userId
+                }).ToList()
+            );
+
             //79  车/导游地接  --> 国交部门(7) OP(28) 岗位
             _GroupsTaskAssignments.AddRange(
                 userDatas.Where(it => it.DepId == 7 && it.JobPostId == 28)

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -468,7 +468,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                        And ClientName = '{1}'
                                                        And ClientUnit ='{2}'
                                                        And VisitDate ='{3}'",dto.TeamName, dto.ClientName, dto.ClientUnit, dto.VisitDate);
-                    var selectGroupInfo = await _sqlSugar.SqlQueryable<Grp_DelegationInfo>(selectSql).FirstAsync();
+                    var selectGroupInfo =  _sqlSugar.SqlQueryable<Grp_DelegationInfo>(selectSql).First();
                     if (selectGroupInfo != null)
                     {
                         result.Msg = "数据已存在,请勿重复添加!";
@@ -547,7 +547,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         VisitEndDate = endTime,
                     };
 
-                    var addId = await _sqlSugar.Insertable(delegationInfo).ExecuteReturnIdentityAsync();
+                    var addId = _sqlSugar.Insertable(delegationInfo).ExecuteReturnIdentity();
                     if (addId > 0)
                     {
                         result.Code = 0;