增加团组信息操作 数据源等接口

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -7,7 +7,7 @@ using OASystem.Infrastructure.Repositories.Groups;
 namespace OASystem.API.Controllers
 {
     /// <summary>
-    /// 团组
+    /// 团组相关
     /// </summary>
     //[Authorize]
     [Route("api/[controller]/[action]")]
@@ -65,11 +65,10 @@ namespace OASystem.API.Controllers
 
         #endregion
 
-
         #region 团组基本信息
 
         /// <summary>
-        ///  接团信息 List
+        ///  接团信息列表
         /// </summary>
         /// <param name="dto">团组列表请求dto</param>
         /// <returns></returns>
@@ -82,11 +81,11 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, groupData.Msg));
             }
 
-            return Ok(JsonView(groupData.Data, groupData.Data.Count));
+            return Ok(JsonView(groupData.Data));
         }
 
         /// <summary>
-        ///  接团信息 Singe
+        ///  接团信息详情
         /// </summary>
         /// <param name="dto">团组info请求dto</param>
         /// <returns></returns>
@@ -99,7 +98,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, groupData.Msg));
             }
 
-            return Ok(JsonView(groupData.Data, groupData.Data.Count));
+            return Ok(JsonView(groupData.Data));
         }
 
         /// <summary>
@@ -109,9 +108,9 @@ namespace OASystem.API.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IActionResult> GetGroupEditBasicSource(GroupListDto dto)
+        public async Task<IActionResult> GroupEditBasicSource(GroupListDto dto)
         {
-            var groupData = await _groupRepository.GetGroupEditBasicSource(dto);
+            var groupData = await _groupRepository.GroupEditBasicSource(dto);
             if (groupData.Code != 0)
             {
                 return Ok(JsonView(false, groupData.Msg));
@@ -121,8 +120,7 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 接团信息 操作
-        /// 基础信息数据源
+        /// 接团信息 操作(增删改)
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -138,6 +136,22 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(true));
         }
 
+        /// <summary>
+        /// 获取团组销售报价号
+        /// 团组添加时 使用
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> GetGroupSalesQuoteNo()
+        {
+            var groupData = await _groupRepository.GetGroupSalesQuoteNo();
+            if (groupData.Code != 0)
+            {
+                return Ok(JsonView(false, groupData.Msg));
+            }
+
+            return Ok(JsonView(true, groupData.Data));
+        }
         #endregion
     }
 }

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -44,6 +44,11 @@ namespace OASystem.API.Controllers
             _JobPostAuthorityRepository = jobPostAuthorityRepository;
             _UserAuthorityRepository = userAuthorityRepository;
         }
+        #region 消息
+
+
+
+        #endregion
 
         #region 企业操作
         /// <summary>

OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -32,7 +32,9 @@ namespace OASystem.Domain.Dtos.Groups
     {
         /// <summary>
         /// 操作状态
-        /// 1 添加 2 修改
+        /// 1 添加 
+        /// 2 修改 
+        /// 3 删除
         /// </summary>
         public int Status { get; set; }
 

OASystem/OASystem.Domain/ViewModels/Group/DelegationInfoView.cs

@@ -15,7 +15,7 @@ namespace OASystem.Domain.ViewModels.Group
     public class DelegationInfoView : Grp_DelegationInfo { }
     
     /// <summary>
-    /// 接团信息列表
+    /// 接团信息详情
     /// 返回视图
     /// </summary>
     public class DelegationInfoWebView
@@ -30,16 +30,17 @@ namespace OASystem.Domain.ViewModels.Group
         /// </summary>
         public string SalesQuoteNo { get; set; }
 
-        /// <summary>
-        /// 团组类型
-        /// </summary>
-        public int TeamDid { get; set; }
 
         /// <summary>
         /// 团组等级
         /// </summary>
         public int TeamLevSId { get; set; }
 
+        /// <summary>
+        /// 团组类型
+        /// </summary>
+        public int TeamDid { get; set; }
+
         /// <summary>
         /// 团组名称
         /// </summary>
@@ -137,7 +138,7 @@ namespace OASystem.Domain.ViewModels.Group
     /// 接团信息列表
     /// 返回视图
     /// </summary>
-    public class DelegationListView :DtoBase
+    public class DelegationListView 
     {
         /// <summary>
         /// 主键Id
@@ -157,12 +158,12 @@ namespace OASystem.Domain.ViewModels.Group
         /// <summary>
         /// 团组等级 
         /// </summary>
-        public int TeamLevSId { get; set; }
+        public string TeamLev { get; set; }
 
         /// <summary>
         /// 团组类型
         /// </summary>
-        public int TeamDid { get; set; }
+        public string TeamType { get; set; }
 
         /// <summary>
         /// 团组名称

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

@@ -23,8 +23,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
         private readonly SetDataRepository _setDataRepository;
         private readonly UsersRepository _usersRepository;
 
-        public DelegationInfoRepository(SqlSugarClient sqlSugar, SetDataRepository setDataRepository, UsersRepository usersRepository) 
-            : base(sqlSugar) 
+        public DelegationInfoRepository(SqlSugarClient sqlSugar, SetDataRepository setDataRepository, UsersRepository usersRepository)
+            : base(sqlSugar)
         {
             this._setDataRepository = setDataRepository;
             this._usersRepository = usersRepository;
@@ -37,7 +37,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <returns></returns>
         public async Task<Result> GetGroupList(GroupListDto dto)
         {
-            Result result = new Result() { Code = -2,Msg="未知错误" };
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
 
             if (dto.PortType == 1) //web
             {
@@ -49,7 +49,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                              Left Join Sys_Users su On gdi.JietuanOperator = su.Id
                                              Where gdi.IsDel = 0 
                                              Order By VisitDate Desc");
-                    
+
                 var _DelegationList = await _sqlSugar.SqlQueryable<DelegationListView>(sql).ToListAsync();
                 if (_DelegationList.Count > 0)
                 {
@@ -63,13 +63,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
             }
 
-            
-            
+
             return result;
 
         }
 
-
         /// <summary>
         /// 获取接团信息Info
         /// </summary>
@@ -85,9 +83,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
 	                                                ClientUnit,VisitCountry,VisitDate,VisitDays,VisitPNumber,TontractTime,
 	                                                PayDay,PaymentMoney,VisitPurpose,SpecialNeeds,OtherNeeds,CGRWSPBMMC,CGRWSPWH,
 	                                                ZZSCBMMC,ZZSCSPWH,Remark,TellPhone
-                                             From Grp_DelegationInfo Where Id = {0} And IsDel=0",dto.Id);
+                                             From Grp_DelegationInfo Where Id = {0} And IsDel = 0", dto.Id);
 
-                var _DelegationInfo = await _sqlSugar.SqlQueryable<DelegationInfoWebView>(sql).ToListAsync();
+                var _DelegationInfo = await _sqlSugar.SqlQueryable<DelegationInfoWebView>(sql).FirstAsync();
                 if (_DelegationInfo != null)
                 {
                     result.Code = 0;
@@ -110,7 +108,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> GetGroupEditBasicSource(GroupListDto dto)
+        public async Task<Result> GroupEditBasicSource(GroupListDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
 
@@ -142,7 +140,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 result.Code = 0;
                 result.Msg = "成功!";
-                result.Data = new {
+                result.Data = new
+                {
                     teamTypeData = teamTypeData1,
                     teamLevData = teamLevData1,
                     userData = userData1
@@ -199,7 +198,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                    And TeamName = '{1}'
                                                    And ClientName = '{2}'
                                                    And ClientUnit ='{3}'
-                                                   And VisitDate ='{4}'",dto.SalesQuoteNo,dto.TeamName,dto.ClientName,dto.ClientUnit,dto.VisitDate);
+                                                   And VisitDate ='{4}'", dto.SalesQuoteNo, dto.TeamName, dto.ClientName, dto.ClientUnit, dto.VisitDate);
                     var selectGroupInfo = await _sqlSugar.SqlQueryable<Grp_DelegationInfo>(selectSql).FirstAsync();
                     if (selectGroupInfo != null)
                     {
@@ -208,13 +207,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
 
                     string teamCodeSql = string.Format("Select TourCode From Grp_DelegationInfo");
-                   var teamCodeItem = await _sqlSugar.SqlQueryable<TeamCodeView>(teamCodeSql).FirstAsync();
+                    var teamCodeItem = await _sqlSugar.SqlQueryable<TeamCodeView>(teamCodeSql).ToListAsync();
 
                     string teamCode = "";
                     while (true)
                     {
                         teamCode = Tools.CommonFun.GetRandomAllStr(6);
-                        
+
                         if (!teamCodeItem.Equals(teamCode))
                         {
                             break;
@@ -249,10 +248,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
 
 
-                }
-                else if (dto.Status == 2)  //修改
+                }  //增加
+                else if (dto.Status == 2)     //修改
                 {
-                    var updateStatus = await UpdateAsync(a => a.Id == dto.Id,a=> groupInfo);
+                    var updateStatus = await UpdateAsync(a => a.Id == dto.Id, a => groupInfo);
 
                     if (updateStatus)
                     {
@@ -264,9 +263,85 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         result.Msg = "修改失败!";
                     }
                 }
+                else if (dto.Status == 3)  //删除
+                {
+                    var deleteStatus = await UpdateAsync(a => a.Id == dto.Id, a => new Grp_DelegationInfo { 
+                        DeleteUserId = dto.UserId,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                        IsDel = 1
+                    });
+
+                    if (deleteStatus)
+                    {
+                        result.Code = 0;
+                        result.Msg = "删除成功!";
+                    }
+                    else
+                    {
+                        result.Msg = "删除失败!";
+                    }
+                }
             }
-            
+
             return result;
         }
+
+        /// <summary>
+        /// 获取销售报价号
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Result> GetGroupSalesQuoteNo()
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+
+            string teamCodeSql = string.Format("Select TourCode From Grp_DelegationInfo");
+            var teamCodeItem = await _sqlSugar.SqlQueryable<TeamCodeView>(teamCodeSql).ToListAsync();
+
+            string teamCode = "";
+            while (true)
+            {
+                teamCode = Tools.CommonFun.GetRandomAllStr(6);
+
+                if (!teamCodeItem.Equals(teamCode))
+                {
+                    break;
+                }
+            }
+
+            result.Code = 0;
+            result.Msg = "成功!";
+            result.Data = teamCode;
+            return result;
+        }
+
+        /// <summary>
+        /// 团组删除
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Result> GroupDeleteById()
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+
+            string teamCodeSql = string.Format("Select TourCode From Grp_DelegationInfo");
+            var teamCodeItem = await _sqlSugar.SqlQueryable<TeamCodeView>(teamCodeSql).ToListAsync();
+
+            string teamCode = "";
+            while (true)
+            {
+                teamCode = Tools.CommonFun.GetRandomAllStr(6);
+
+                if (!teamCodeItem.Equals(teamCode))
+                {
+                    break;
+                }
+            }
+
+            result.Code = 0;
+            result.Msg = "成功!";
+            result.Data = teamCode;
+            return result;
+        }
+
+
     }
 }

OASystem/OASystem.Infrastructure/Repositories/System/MessageRepository.cs

@@ -12,7 +12,6 @@ namespace OASystem.Infrastructure.Repositories.System
     {
         public MessageRepository(SqlSugarClient sqlSugar) : base(sqlSugar) { }
 
-
         /// <summary>
         /// 发布消息
         /// </summary>
@@ -103,7 +102,8 @@ namespace OASystem.Infrastructure.Repositories.System
                                                  Inner Join Sys_Users suAuth On smra.ReadableUId = suAuth.Id
                                                  Where sm.IsDel = 0
                                                  And smra.IsDel = 0 
-                                                 And smra.ReadableUId = {0}", uId);
+                                                 And smra.ReadableUId = {0}
+                                                 Order By ReleaseTime Desc ", uId);
             var _readableMsgList = await _sqlSugar.SqlQueryable<ReadbleMessageView>(msgSqlWhere).ToListAsync();
             if (_readableMsgList.Count > 0)
             {
@@ -113,10 +113,12 @@ namespace OASystem.Infrastructure.Repositories.System
             }
             else
             {
-                result.Msg = "暂无该用户消息";
+                result.Msg = "暂无该用户的消息!";
             }
 
             return result;
         }
+        
+
     }
 }