接团客户名单

Bug 修改

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -4,6 +4,7 @@ using OASystem.API.OAMethodLib.ALiYun;
 using OASystem.API.OAMethodLib.ExcelOutput;
 using OASystem.Domain.Common;
 using OASystem.Domain.Dtos.Business;
+using OASystem.Domain.Dtos.FileDto;
 using OASystem.Domain.Dtos.Financial;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Business;
@@ -621,5 +622,42 @@ Where c.ConfListId = {0}", ConfId);
         }
 
         #endregion
+
+
+        #region 文件删除
+        /// <summary>
+        ///  文件操作 
+        ///  删除指定文件 
+        /// </summary>
+        /// <param name="dto">Dto</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostFileDel(FileDelDto dto)
+        {
+            try
+            {
+                string pathUrl = dto.PathUrl;
+                if (string.IsNullOrEmpty(pathUrl))
+                    return Ok(JsonView(false, "路径为空或者不是有效路径!"));
+
+                if (System.IO.File.Exists(pathUrl))
+                {
+                    System.IO.File.Delete(pathUrl);
+                    return Ok(JsonView(false, "操作成功!"));
+                }
+                else
+                {
+                    return Ok(JsonView(false, "该文件不存在!"));
+                }
+            }
+            catch (Exception ex)
+            {
+
+                return Ok(JsonView(false, ex.Message));
+            }
+        }
+
+        #endregion
     }
 }

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -43,6 +43,7 @@ using System.Diagnostics.Eventing.Reader;
 using System.IO;
 using StackExchange.Redis;
 using Org.BouncyCastle.Utilities;
+using Aspose.Words.Drawing;
 
 namespace OASystem.API.Controllers
 {
@@ -5992,6 +5993,41 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(viewData.Data));
         }
 
+        /// <summary>
+        /// 接团客户名单
+        /// AddMultiple(添加多个)
+        /// </summary>
+        /// <param name="_dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> PostTourClientListAddMultiple(TourClientListAddMultipleDto _dto)
+        {
+            #region  参数验证
+            if (_dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数"));
+            if (_dto.PageId < 1) _dto.PageId = 104; //接团客户名单PageId
+
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+
+           
+            if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
+           
+
+            #endregion
+
+            #endregion
+
+            var viewData = await _tourClientListRep._AddMultiple(_dto);
+            if (viewData.Code != 0)
+            {
+                return Ok(JsonView(false, viewData.Msg));
+            }
+
+            return Ok(JsonView(true,viewData.Msg));
+        }
+
         /// <summary>
         /// 接团客户名单
         /// Del
@@ -6024,6 +6060,109 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(viewData.Data));
         }
+
+        /// <summary>
+        /// 接团客户名单
+        /// 文件下载 客户名单
+        /// </summary>
+        /// <param name="_dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> PostTourClientListDownloadFile(PostTourClientListDownloadFile _dto)
+        {
+            #region  参数验证
+            if (_dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数"));
+            if (_dto.PageId < 1) _dto.PageId = 104; //接团客户名单PageId
+            if (_dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数"));
+
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+            if (pageFunAuthView.FilesDownloadAuth == 0) return Ok(JsonView(false, "您没有文件下载权限!"));
+
+            #endregion
+
+            #endregion
+
+            string clientSql = string.Format(@"Select tcl.Id,tcl.DiId,temp.*,tcl.ShippingSpaceTypeId,tcl.ShippingSpaceSpecialNeeds,
+                                                      tcl.HotelSpecialNeeds,tcl.MealSpecialNeeds,tcl.Remark
+                                               From Grp_TourClientList tcl
+                                               Left Join 
+	                                               (Select dc.Id As DcId,dc.LastName,dc.FirstName,dc.Pinyin,dc.Sex,ccom.CompanyFullName,dc.Job,
+	                                                   cc1.CertNo As IDCardNo,dc.Phone,dc.BirthDay,cc2.PassportType,cc2.CertNo As PassportNo,cc2.Country,
+	                                                   cc2.Area,cc2.IssueDt,cc2.ExpiryDt
+	                                                   From Crm_DeleClient dc
+	                                                   Left Join Crm_CustomerCompany ccom On dc.CrmCompanyId = ccom.Id  And ccom.IsDel = 0
+	                                                   Left Join Crm_CustomerCert cc1 On dc.Id = cc1.DcId And cc1.SdId = 773 And cc1.IsDel = 0
+	                                                   Left Join Crm_CustomerCert cc2 On dc.Id = cc2.DcId And cc2.SdId = 774 And cc2.IsDel = 0
+	                                                   Where dc.IsDel = 0) temp 
+                                               On temp.DcId =tcl.ClientId  
+                                               Where tcl.IsDel = 0 And tcl.DiId = {0}",_dto.DiId);
+            List<TourClientListDetailsView> DcList = await _sqlSugar.SqlQueryable<TourClientListDetailsView>(clientSql).ToListAsync();
+
+            if (DcList.Count < 0) return Ok(JsonView(false, "该团未录入客户名单!"));
+
+            //载入模板
+            string tempPath = AppSettingsHelper.Get("WordBasePath") + "Template/dwon_团组人员列表模板.doc";
+
+            //载入模板
+            var doc = new Document(tempPath);
+            DocumentBuilder builder = new DocumentBuilder(doc);
+
+            //获取word里所有表格
+            NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
+
+            //获取所填表格的序数
+            Aspose.Words.Tables.Table tableOne = allTables[0] as Aspose.Words.Tables.Table;
+
+            var rowStart = tableOne.Rows[0]; //获取第1行
+
+            //循环赋值
+            for (int i = 0; i < DcList.Count; i++)
+            {
+                builder.MoveToCell(0, i + 1, 0, 0);
+                builder.Write(DcList[i].LastName + DcList[i].FirstName);
+
+                builder.MoveToCell(0, i + 1, 1, 0);
+                int sex = DcList[i].Sex;
+                string sexStr = string.Empty;
+                if (sex == 0) sexStr = "男";
+                else if (sex == 1) sexStr = "女";
+                else sexStr = "未设置";
+                builder.Write(sexStr);
+
+                builder.MoveToCell(0, i + 1, 2, 0);
+                string birthDay = DcList[i].BirthDay;
+                string birthDayStr = string.Empty;
+                if (!string.IsNullOrEmpty(birthDay))
+                {
+                    birthDayStr = Convert.ToDateTime(birthDay).ToString("yyyy-MM-dd");
+                }
+                builder.Write(birthDayStr);
+
+                builder.MoveToCell(0, i + 1, 3, 0);
+                builder.Write(DcList[i].CompanyFullName);
+
+                builder.MoveToCell(0, i + 1, 4, 0);
+                builder.Write(DcList[i].Job);
+            }
+
+
+            //删除多余行
+            while (tableOne.Rows.Count > DcList.Count + 1)
+            {
+                tableOne.Rows.RemoveAt(DcList.Count + 1);
+            }
+
+            string fileName = "组团人员名单(" + DateTime.Now.ToString("yyyyhhddHHmmss") + ").doc";
+
+            var fileDir = AppSettingsHelper.Get("WordBasePath") + fileName;
+            doc.Save(fileDir);
+            string Url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/" + fileName;
+            return Ok(JsonView(true, "操作成功！", Url));
+        }
+
         #endregion
     }
 }

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -281,11 +281,8 @@ namespace OASystem.API.Controllers
 										//ccp.DayRate,ccp.Payee,
 										//From Grp_HotelReservations  hr
           //                              Inner Join Grp_CreditCardPayment ccp On hr.Id = ccp.CId
-
           //                              Left Join Sys_SetData sd1 On ccp.PaymentCurrency = sd1.Id
-
           //                              Where hr.IsDel = 0 And ccp.IsDel = 0 And ccp.CTable = 76 And ccp.IsAuditGM = 1 And ccp.IsPay = 1
-
           //                              And hr.DiId = 2337
 
 

OASystem/OASystem.Domain/Dtos/FileDto/FileDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.FileDto
+{
+    /// <summary>
+    /// 文件 Dto
+    /// </summary>
+    public class FileDto
+    {
+    }
+
+    /// <summary>
+    /// 文件删除 Dto
+    /// </summary>
+    public class FileDelDto
+    {
+        /// <summary>
+        /// 文件路径(含文件名称)
+        /// </summary>
+        public string? PathUrl { get; set; }
+    }
+}

OASystem/OASystem.Domain/Dtos/Groups/TourClientListDto.cs

@@ -99,46 +99,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public string? IDCardNo { get; set; }
 
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string? Tel { get; set; }
-
         /// <summary>
         /// 生日
         /// </summary>
         public string? BirthDay { get; set; }
 
-        ///// <summary>
-        ///// 护照类型Id(数据类型表Id)
-        ///// </summary>
-        //public int PassportType { get; set; }
-
-        ///// <summary>
-        ///// 护照No
-        ///// </summary>
-        //public string? PassportNo { get; set; }
-
-        ///// <summary>
-        ///// 签发国
-        ///// </summary>
-        //public string? Country { get; set; }
-
-        ///// <summary>
-        ///// 签发地区
-        ///// </summary>
-        //public string? Area { get; set; }
-
-        ///// <summary>
-        ///// 签发时间
-        ///// </summary>
-        //public string? IssueDt { get; set; }
-
-        ///// <summary>
-        ///// 有效期限
-        ///// </summary>
-        //public string? ExpiryDt { get; set; }
-
         /// <summary>
         /// 舱位类型(数据类型表Id)
         /// </summary>
@@ -165,6 +130,79 @@ namespace OASystem.Domain.Dtos.Groups
         public string? Remark { get; set; }
     }
 
+    /// <summary>
+    /// 接团客户名单
+    /// AddMultiple
+    /// </summary>
+    public class TourClientListAddMultipleDto : UserPageFuncDtoBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 接团客户名单
+        /// AddMultiple Infos
+        /// </summary>
+        public List<TourClientListInfo>? TourClientListInfos { get; set; }
+
+    }
+
+    /// <summary>
+    /// 接团客户名单
+    /// AddMultiple Info
+    /// </summary>
+    public class TourClientListInfo
+    {
+        /// <summary>
+        /// 姓
+        /// </summary>
+        public string? LastName { get; set; }
+
+        /// <summary>
+        /// 名
+        /// </summary>
+        public string? FirstName { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// 0 男1 女 其他值 未设置
+        /// </summary>
+        public int Sex { get; set; }
+
+        /// <summary>
+        /// 公司名全称
+        /// </summary>
+        public string? CompanyFullName { get; set; }
+
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string? Job { get; set; }
+
+        /// <summary>
+        /// 身份证No
+        /// </summary>
+        public string? IDCardNo { get; set; }
+
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string? Phone { get; set; }
+
+        /// <summary>
+        /// 生日
+        /// </summary>
+        public string? BirthDay { get; set; }
+
+        /// <summary>
+        /// 舱位类型(数据类型表Id)
+        /// </summary>
+        public int ShippingSpaceTypeId { get; set; }
+
+    }
+
     /// <summary>
     /// 接团客户名单
     /// Del
@@ -178,4 +216,13 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int Id { get; set; }
     }
+
+    /// <summary>
+    /// 接团客户名单
+    /// 客户名单下载
+    /// </summary>
+    public class PostTourClientListDownloadFile: UserPageFuncDtoBase
+    {
+        public int DiId { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/Customer/Crm_CustomerCert.cs

@@ -58,12 +58,12 @@ namespace OASystem.Domain.Entities.Customer
         /// 有效期起始时间
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime IssueDt { get; set; }
+        public DateTime? IssueDt { get; set; } = null;
         /// <summary>
         /// 有效期截止时间
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime ExpiryDt { get; set; }
+        public DateTime? ExpiryDt { get; set; } = null;
 
         /// <summary>
         /// 身份证户籍地址

OASystem/OASystem.Domain/Entities/Customer/Crm_CustomerCompany.cs

@@ -39,6 +39,6 @@ namespace OASystem.Domain.Entities.Customer
         /// 最后操作时间
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime LastedOpDt { get; set; }
+        public DateTime LastedOpDt { get; set; } = DateTime.Now;
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/TourClientListRepository.cs

@@ -1,11 +1,13 @@
 using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.Dtos.CRM;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Tools;
 using Org.BouncyCastle.Utilities.Encoders;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -175,7 +177,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 return _result;
             }
 
-            if (dto.Id < 0) 
+            if (dto.Id >= 0) 
             {
 
                 #region 参数处理
@@ -191,12 +193,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 Crm_CustomerCompany _CustomerCompany = new Crm_CustomerCompany()
                 {
                     CompanyFullName = dto.CompanyFullName,
+                    LastedOpUserId = dto.UserId,
                     CreateUserId = dto.UserId
                 };
 
                 Crm_CustomerCert _CustomerCert = new Crm_CustomerCert()
                 {
-                    SdId = 733,
+                    SdId = 773,
                     CertNo = dto.IDCardNo,
                     CreateUserId = dto.UserId
                 };
@@ -314,6 +317,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 //客户身份证操作
                 //3.添加 or 修改 身份证信息
+                _CustomerCert.DcId = clientId;
                 if (clientInfo == null)
                 {
                     var certInfo = await _sqlSugar.Queryable<Crm_CustomerCert>().Where(it => it.IsDel == 0 &&
@@ -339,6 +343,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                                                        ).FirstAsync();
                     if (certInfo == null)
                     {
+
                         var certAdd = await _sqlSugar.Insertable(_CustomerCert).ExecuteReturnIdentityAsync();
                         if (certAdd < 0)
                         {
@@ -426,6 +431,190 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return _result;
         }
 
+
+        /// <summary>
+        /// AddMultiple
+        /// 添加多个
+        /// </summary>
+        /// <param name="portId"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<Result> _AddMultiple(TourClientListAddMultipleDto dto)
+        {
+            if (dto.DiId < 0)
+            {
+                _result.Msg = string.Format(@"请传入有效的团组Id参数!");
+                return _result;
+            }
+            List<TourClientListInfo> _TourClientListInfos = dto.TourClientListInfos;
+            if (_TourClientListInfos != null || _TourClientListInfos.Count < 0)
+            {
+                _result.Msg = string.Format(@"接团客户名单信息集合为空，不执行批量添加!");
+                return _result;
+            }
+
+            List<Crm_DeleClient> _DeleClients = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0).ToListAsync();
+            List<Crm_CustomerCompany> _CustomerCompanies = await _sqlSugar.Queryable<Crm_CustomerCompany>().Where(it => it.IsDel == 0).ToListAsync();
+            List<Crm_CustomerCert> _CustomerCerts = await _sqlSugar.Queryable<Crm_CustomerCert>().Where(it => it.IsDel == 0 && it.SdId == 773).ToListAsync(); // 身份证类型证件信息
+
+            string _Msg = "";
+            int _DiId = dto.DiId;
+            int _UserId = dto.UserId;
+
+            foreach (var item in _TourClientListInfos)
+            {
+                _sqlSugar.BeginTran();
+                int companyId = -1;
+                int clientId = -1;
+                string clientName = string.Format(@"{0}{1}", item.LastName, item.FirstName);
+                Crm_DeleClient _DeleClientInfo = _DeleClients.Where(it => it.LastName.Equals(item.LastName) &&
+                                                                          it.FirstName.Equals(item.FirstName) &&
+                                                                          it.Phone.Equals(item.Phone)).FirstOrDefault();
+                if (_DeleClientInfo == null) //添加
+                {
+                    if (!string.IsNullOrEmpty(item.CompanyFullName))
+                    {
+                        var companyInfo = _CustomerCompanies.Where(it => it.CompanyFullName.Equals(item.CompanyFullName)).FirstOrDefault();
+                        if (companyInfo != null) companyId = companyInfo.Id;
+                        else
+                        {
+                            Crm_CustomerCompany _CustomerCompany = new Crm_CustomerCompany()
+                            {
+                                CompanyFullName = item.CompanyFullName,
+                                LastedOpUserId = _UserId,
+                                CreateUserId = _UserId
+                            };
+
+                            var companyAdd = await _sqlSugar.Insertable(_CustomerCompany).ExecuteReturnIdentityAsync();
+                            if (companyAdd < 0)
+                            {
+                                _Msg += string.Format("{0} 公司信息添加失败!请前往客户信息确认!\r\n", clientName);
+                            }
+                            companyId = companyAdd;
+                        }
+                    }
+                    
+                    _DeleClientInfo = new Crm_DeleClient() 
+                    {
+                        LastName = item.LastName,
+                        FirstName = item.FirstName,
+                        CrmCompanyId = companyId,
+                        Job = item.Job,
+                        Sex = item.Sex,
+                        Phone = item.Phone,
+                        BirthDay = item.BirthDay,
+                    };
+                    var clientAdd = await _sqlSugar.Insertable(_DeleClientInfo).ExecuteReturnIdentityAsync();
+                    if (clientAdd < 0)
+                    {
+                        _Msg += string.Format("{0} 基本信息添加失败,本条客户名单不添加!请重新添加!\r\n", clientName);
+                        _sqlSugar.RollbackTran();
+                        continue;
+                    }
+                    clientId = clientAdd;
+
+                    if (!string.IsNullOrEmpty(item.IDCardNo))
+                    {
+                        Crm_CustomerCert _CustomerCert = _CustomerCerts.Where(it => it.DcId == clientId && it.CertNo.Equals(item.IDCardNo)).FirstOrDefault();
+                        if (_CustomerCert == null)
+                        {
+                            _CustomerCert = new Crm_CustomerCert() 
+                            {
+                                DcId = clientId,
+                                SdId = 773,
+                                CertNo = item.IDCardNo,
+                                CreateUserId = _UserId,
+                            };
+                            var customerCertAdd = await _sqlSugar.Insertable(_CustomerCert).ExecuteCommandAsync();
+                            if (customerCertAdd < 0)
+                            {
+                                _Msg += string.Format("{0} 身份证信息添加失败!请前往客户信息确认!\r\n", clientName);
+                            }
+                        }
+                    }
+
+                }
+                else //修改客户基本信息
+                {
+                    clientId = _DeleClientInfo.Id;
+
+                    if (!string.IsNullOrEmpty(item.CompanyFullName))
+                    {
+                        var companyInfo = _CustomerCompanies.Where(it => it.CompanyFullName.Equals(item.CompanyFullName)).FirstOrDefault();
+                        if (companyInfo != null) companyId = companyInfo.Id;
+                        else
+                        {
+                            Crm_CustomerCompany _CustomerCompany = new Crm_CustomerCompany()
+                            {
+                                CompanyFullName = item.CompanyFullName,
+                                LastedOpUserId = _UserId,
+                                CreateUserId = _UserId
+                            };
+
+                            var companyAdd = await _sqlSugar.Insertable(_CustomerCompany).ExecuteReturnIdentityAsync();
+                            if (companyAdd < 0)
+                            {
+                                _Msg += string.Format("{0} 公司信息添加失败!请前往客户信息确认!\r\n", clientName);
+                            }
+                            companyId = companyAdd;
+                        }
+                    }
+
+                    Crm_DeleClient _DeleClient = new Crm_DeleClient() { 
+                        LastName = item.LastName,
+                        FirstName = item.FirstName,
+                        Sex = item.Sex,
+                        Phone = item.Phone,
+                        BirthDay = item.BirthDay
+                    };
+                    var clientEdit = await _sqlSugar.Updateable(_DeleClient).UpdateColumns(it =>
+                                                                                 new
+                                                                                 {
+                                                                                     it.LastName,
+                                                                                     it.FirstName,
+                                                                                     it.Sex,
+                                                                                     it.Phone,
+                                                                                     it.BirthDay
+                                                                                 }
+                                                                             )
+                                                                            .Where(it => it.Id == clientId)
+                                                                            .ExecuteCommandAsync();
+                    if (clientEdit < 0)
+                    {
+                        _Msg += string.Format("{0} 基本信息修改失败,!请前往客户信息修改!\r\n", clientName);
+                    }
+
+                }
+
+
+                //团组客户信息名单操作
+                Grp_TourClientList _TourClientList = new Grp_TourClientList()
+                {
+                    DiId = _DiId,
+                    ClientId = clientId,
+                    ShippingSpaceTypeId = item.ShippingSpaceTypeId,
+                    CreateUserId = _UserId
+                };
+                var tourClientAdd = await _sqlSugar.Insertable(_TourClientList).ExecuteReturnIdentityAsync();
+                if (tourClientAdd < 0)
+                {
+                    _Msg += string.Format("{0} 接团客户名单添加失败!请检查数据完整性后重新添加!\r\n", clientName);
+                    _sqlSugar.RollbackTran();
+                    continue;
+                }
+
+                _sqlSugar.CommitTran();
+            }
+
+            if (!string.IsNullOrEmpty(_Msg)) _result.Msg = _Msg;
+            else _result.Msg = string.Format("操作成功!");
+
+            _result.Code = 0;
+
+            return _result;
+        }
+
+
         /// <summary>
         /// Del
         /// </summary>