统一百度OCR And 接团客户名单添加 返回View字段

OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -1,6 +1,7 @@
 using Autofac.Core;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLib.BaiduApi;
 using OASystem.API.OAMethodLib.TencentCloudAPI;
 using OASystem.Domain.Dtos.Baidu;
@@ -117,7 +118,17 @@ namespace OASystem.API.Controllers
                                 string lastName = words.Substring(0, 1);
                                 string name = words.Substring(1);
                                 client.LastName = lastName;
-                                client.Name = name;
+                                client.FirstName = name;
+                                string lastNamePinYin = lastName.GetTotalPingYin()[0].ToUpper();
+                                string firstNamePinYin = "";
+
+                                for (int n = 0; n < name.Length; n++)
+                                {
+                                    firstNamePinYin += name.GetTotalPingYin()[0].ToUpper() + " ";
+                                }
+
+                                client.Pinyin = lastNamePinYin + "//"+ firstNamePinYin;
+
                             }
                             else
                             {
@@ -126,11 +137,11 @@ namespace OASystem.API.Controllers
                                 {
                                     string[] names = words.Split(' ');
                                     client.LastName = names[1];
-                                    client.Name = names[0];
+                                    client.FirstName = names[0];
                                 }
                                 else
                                 {
-                                    client.Name = words;
+                                    client.FirstName = words;
                                 }
                             }
                         }
@@ -158,7 +169,7 @@ namespace OASystem.API.Controllers
                         }
                         else if (values.Equals("Organization"))
                         {
-                            client.Company = words;
+                            client.CompanyFullName = words;
                         }
                         else if (values.Equals("Job"))
                         {

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -535,14 +535,13 @@ namespace OASystem.API.Controllers
         {
             try
             {
-
                 #region  参数验证
                 if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数"));
                 PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
                 #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 104);
-                if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "客户名单您没有添加权限!"));
+                //pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 104);
+                //if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "客户名单您没有添加权限!"));
                 pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, 27);
                 if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "团组操作您没有添加权限!"));
                 #endregion
@@ -559,7 +558,7 @@ namespace OASystem.API.Controllers
                 }
 
                 //添加时 默认加入团组汇率
-                if (dto.Status == 1)
+                if (dto.Status == 1) //添加
                 {
                     int diId = groupData.Data;
 
@@ -581,7 +580,6 @@ namespace OASystem.API.Controllers
                         return Ok(JsonView(false, "客户名单添加失败！"+ viewData.Msg));
                     }
                 }
-
                 _sqlSugar.CommitTran();
                 return Ok(JsonView(true, "添加成功"));
             }

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

@@ -11,7 +11,7 @@ namespace OASystem.Domain.Dtos.Groups
     /// <summary>
     /// 获取团组列表 请求实体类
     /// </summary>
-    public class GroupListDto:DtoBase
+    public class GroupListDto : DtoBase
     {
     }
 
@@ -223,7 +223,7 @@ namespace OASystem.Domain.Dtos.Groups
     /// <summary>
     /// 团组信息删除
     /// </summary>
-    public class GroupDelDto:DtoBase
+    public class GroupDelDto : DtoBase
     {
         /// <summary>
         /// 团组Id
@@ -268,7 +268,7 @@ namespace OASystem.Domain.Dtos.Groups
     /// <summary>
     /// 确认出团dto
     /// </summary>
-    public class ConfirmationGroupDto:PortDtoBase 
+    public class ConfirmationGroupDto : PortDtoBase
     {
         /// <summary>
         /// 团组Id
@@ -341,7 +341,7 @@ namespace OASystem.Domain.Dtos.Groups
 
     }
 
-    public class GroupProcessOperationDto: PortDtoBase
+    public class GroupProcessOperationDto : PortDtoBase
     {
         /// <summary>
         /// 操作状态
@@ -504,4 +504,5 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public List<TourClientListInfo>? TourClientListInfos { get; set; }
     }
+
 }

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

@@ -201,6 +201,90 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int ShippingSpaceTypeId { get; set; }
 
+        /// <summary>
+        /// 舱位特殊需求
+        /// </summary>
+        public string? ShippingSpaceSpecialNeeds { get; set; }
+
+        /// <summary>
+        /// 酒店特殊需求
+        /// </summary>
+        public string? HotelSpecialNeeds { get; set; }
+
+        /// <summary>
+        /// 餐食特殊需求
+        /// </summary>
+        public string? MealSpecialNeeds { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; }
+    }
+
+    // <summary>
+    /// 接团客户名单
+    /// AddMultiple Info
+    /// </summary>
+    public class TourClientListInfo1
+    {
+        /// <summary>
+        /// 姓
+        /// </summary>
+        public string LastName { get; set; }
+        /// <summary>
+        /// 名
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string Sex { get; set; }
+        /// <summary>
+        /// 生日
+        /// </summary>
+        public string Birthday { get; set; } = null;
+        /// <summary>
+        /// 身份证
+        /// </summary>
+        public string IDcard { get; set; } = null;
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string Company { get; set; }
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string Job { get; set; }
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string Phone { get; set; }
+
+        /// <summary>
+        /// 仓位类型
+        /// </summary>
+        public int Berth { get; set; } = 460;
+
+        /// <summary>
+        /// 仓位备注
+        /// </summary>
+        public string BerthNotes { get; set; }
+
+        /// <summary>
+        /// 房间备注
+        /// </summary>
+        public string RoomNotes { get; set; }
+
+        /// <summary>
+        /// 餐食备注
+        /// </summary>
+        public string MealNotes { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
     /// <summary>

OASystem/OASystem.Domain/ViewModels/OCR/BaiduClientOCRView.cs

@@ -8,6 +8,20 @@ namespace OASystem.Domain.ViewModels.OCR
 {
     public class BaiduClientOCRView
     {
+        /// <summary>
+        /// 姓
+        /// </summary>
+        public string LastName { get; set; }
+        /// <summary>
+        /// 名
+        /// </summary>
+        public string FirstName { get; set; }
+
+        /// <summary>
+        /// 拼音
+        /// </summary>
+        public string Pinyin { get; set; }
+
         /// <summary>
         /// 性别
         /// </summary>
@@ -23,7 +37,7 @@ namespace OASystem.Domain.ViewModels.OCR
         /// <summary>
         /// 单位
         /// </summary>
-        public string Company { get; set; }
+        public string CompanyFullName { get; set; }
         /// <summary>
         /// 职位
         /// </summary>
@@ -32,37 +46,34 @@ namespace OASystem.Domain.ViewModels.OCR
         /// 手机号
         /// </summary>
         public string Phone { get; set; }
-        /// <summary>
-        /// 姓
-        /// </summary>
-        public string LastName { get; set; }
-        /// <summary>
-        /// 名
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 英文名
-        /// </summary>
-        public string NameSpell { get; set; }
-
-        /// <summary>
-        /// 仓位类型
-        /// </summary>
-        public int Berth { get; set; } = 460;
+        
+        ///// <summary>
+        ///// 英文名
+        ///// </summary>
+        //public string NameSpell { get; set; }
 
+        ///// <summary>
+        ///// 仓位类型
+        ///// </summary>
+        //public int Berth { get; set; } = 460;
 
-        public string BerthNotes {  get; set; }
+        ///// <summary>
+        ///// 仓位备注
+        ///// </summary>
+        //public string BerthNotes {  get; set; }
 
-        public string RoomNotes { get; set; }
+        ///// <summary>
+        ///// 房间备注
+        ///// </summary>
+        //public string RoomNotes { get; set; }
         
-        public string MealNotes { get; set; }
-
+        ///// <summary>
+        ///// 餐食备注
+        ///// </summary>
+        //public string MealNotes { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
-        public string Notes { get; set; }
-
-
+        public string Remark { get; set; }
     }
 }

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

@@ -532,7 +532,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             }
                         }
                     }
-
                 }
                 else //修改客户基本信息
                 {
@@ -586,7 +585,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 }
 
-
                 //团组客户信息名单操作
                 Grp_TourClientList _TourClientList = new Grp_TourClientList()
                 {