visa bug

OASystem/OASystem.Api/OAMethodLib/KiMiApi/KiMiApi.cs

@@ -100,6 +100,7 @@ namespace OASystem.API.OAMethodLib.KiMiApi
             return JsonConvert.DeserializeObject<KiMiRoot>(respStr);
         }
 
+
         private async Task<string> SeedAsync(List<SeedMessages> messages)
         {
             var completionRequest = new
@@ -110,7 +111,8 @@ namespace OASystem.API.OAMethodLib.KiMiApi
                     Role = StringEnumHelper.ToStringValue(x.Role),
                     x.Content
                 }),
-                temperature = 1
+                temperature = 1,
+                max_tokens = 4096
             };
 
             var completionJson = JsonConvert.SerializeObject(completionRequest);
@@ -126,6 +128,7 @@ namespace OASystem.API.OAMethodLib.KiMiApi
 
             return completionResponseContent;
         }
+
     }
 
     public class SeedMessages
@@ -148,9 +151,13 @@ namespace OASystem.API.OAMethodLib.KiMiApi
 
     public class Choice
     {
+        [JsonProperty("index")]
         public int Index { get; set; }
         public ReturnMessage Message { get; set; }
+
+        [JsonProperty("finish_reason")]
         public string FinishReason { get; set; }
+
     }
 
     public class Usage

OASystem/OASystem.Domain/AesEncryption/EncryptionProcessor.cs

@@ -1,10 +1,5 @@
 using OASystem.Domain.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OASystem.Domain.AesEncryption
 {
@@ -13,7 +8,7 @@ namespace OASystem.Domain.AesEncryption
     /// </summary>
     public static class EncryptionProcessor
     {
-       
+
         /// <summary>
         /// aes 加密
         /// </summary>

OASystem/OASystem.Domain/Attributes/EncryptedAttribute.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OASystem.Domain.Attributes
+namespace OASystem.Domain.Attributes
 {
     /// <summary>
     /// Aes 加密/解密

OASystem/OASystem.Domain/Entities/Customer/Crm_DeleClient.cs

@@ -1,9 +1,4 @@
 using OASystem.Domain.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OASystem.Domain.Entities.Customer
 {
@@ -196,17 +191,7 @@ namespace OASystem.Domain.Entities.Customer
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "Datetime")]
         public DateTime EndTime { get; set; }
-        /// <summary>
-        /// 申根是否在使馆有指纹记录 
-        /// 0否1是
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int IsFinger { get; set; } = 0;
-        /// <summary>
-        /// 申根指纹录入时间
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime FingerDate { get; set; }
+        
         /// <summary>
         /// 是否因公去过美国/加拿大
         /// 0否1是
@@ -233,33 +218,11 @@ namespace OASystem.Domain.Entities.Customer
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CanDays { get; set; } = 0;
-        /// <summary>
-        /// 是否曾获得过因公美国签证 0否1是
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int IsUSAVia { get; set; }
-        /// <summary>
-        /// 因公美国签证最近获得时间
-        /// 0否1是
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime GetUSAVisaDate { get; set; }
-        /// <summary>
         /// 因公美国签证地点
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string GetUPPlace { get; set; }
         /// <summary>
-        /// 因公美国签证种类
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string USAVisaCate { get; set; }
-        /// <summary>
-        /// 因公美国签证编码
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string USAVisaCode { get; set; }
-        /// <summary>
         /// 是否在使馆留过十指的指纹 0否1是
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
@@ -480,11 +443,46 @@ namespace OASystem.Domain.Entities.Customer
 
 
         //----------增加字段------------
+
         /// <summary>
-        /// 离婚原因
+        /// 赴美目的
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
-        public string DivorceRsn { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string USAPurpose { get; set; }
+
+        /// <summary>
+        /// 是否曾获得过因公美国签证 0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsUSAVia { get; set; }
+
+        /// <summary>
+        /// 因公美国签证最近获得时间 / 有效期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime? GetUSAVisaDate { get; set; }
+        /// <summary>
+        /// 因公美国签证种类
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string USAVisaCate { get; set; }
+        /// <summary>
+        /// 因公美国签证编码
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string USAVisaCode { get; set; }
+
+        /// <summary>
+        /// 申根是否在使馆有指纹记录 
+        /// 0否1是
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsFinger { get; set; } = 0;
+        /// <summary>
+        /// 申根指纹录入时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
+        public DateTime? FingerDate { get; set; }
 
         /// <summary>
         /// 美国驾照No
@@ -509,6 +507,24 @@ namespace OASystem.Domain.Entities.Customer
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string Resident { get; set; }
 
+        /// <summary>
+        /// 曾抵达过美国时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string USAHadArrival‌ { get; set; }
+        /// <summary>
+        /// 曾停留美国天数
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
+        public string USAHadDays‌ { get; set; }
+
+
+        /// <summary>
+        /// 离婚原因
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string DivorceRsn { get; set; }
+
         /// <summary>
         /// 近五年内是否使用过任何社交账号
         /// </summary>
@@ -521,12 +537,6 @@ namespace OASystem.Domain.Entities.Customer
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
         public string USAAddress { get; set; }
 
-        /// <summary>
-        /// 赴美目的
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
-        public string USAPurpose { get; set; }
-
         /// <summary>
         /// 美国联系人或组织
         /// </summary>
@@ -583,16 +593,7 @@ namespace OASystem.Domain.Entities.Customer
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
         public string DenyNationRsn { get; set; }
-        /// <summary>
-        /// 曾抵达过美国时间
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string USAHadArrival‌ { get; set; }
-        /// <summary>
-        /// 曾停留美国天数
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
-        public string USAHadDays‌ { get; set; }
+        
         /// <summary>
         /// 美国移民签证时间
         /// </summary>
@@ -662,7 +663,7 @@ namespace OASystem.Domain.Entities.Customer
         /// <summary>
         /// 母亲出生日期
         /// </summary>
-        [SugarColumn( IsNullable = true, ColumnDataType = "varchar(50)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public DateTime? MthBirth { get; set; }
     }
 
@@ -715,7 +716,10 @@ namespace OASystem.Domain.Entities.Customer
     {
         public string Country { get; set; }
 
-        public DateTime Date { get; set; }
+        public DateTime? Date { get; set; }
+        public string Address { get; set; }
+
+        public string VisaType { get; set; }
 
         public string Reason { get; set; }
     }
@@ -727,9 +731,9 @@ namespace OASystem.Domain.Entities.Customer
     {
         public string Country { get; set; }
 
-        public DateTime ArrivalDate { get; set; }
+        public DateTime? ArrivalDate { get; set; }
 
-        public DateTime DepartureDate { get; set; }
+        public DateTime? DepartureDate { get; set; }
 
         public string VisaType { get; set; }
     }
@@ -743,4 +747,41 @@ namespace OASystem.Domain.Entities.Customer
 
         public string VisitDate { get; set; }
     }
+
+    /// <summary>
+    /// 定义申根签证记录类
+    /// </summary>
+    public class SchengenVisaRecord
+    {
+        public string VisaType { get; set; }        // 签证类型
+        public string VisaNumber { get; set; }      // 签证号码
+        public DateTime? IssueDate { get; set; }     // 签发日期
+        public DateTime? ExpiryDate { get; set; }    // 有效期至
+        //public string IssuingCountry { get; set; }  // 签发国家
+    }
+
+    /// <summary>
+    /// 定义社交账号类
+    /// </summary>
+    public class SocialAccount
+    {
+        public string Platform { get; set; }       // 平台名称
+        public string Account { get; set; }    // 账号
+    }
+
+    /// <summary>
+    /// 亲属朋友信息
+    /// </summary>
+    public class PersonInfo
+    {
+        /// <summary>
+        /// 类型（亲属/朋友/联系人）
+        /// </summary>
+        public string Type { get; set; }
+        public string Name { get; set; }       // 姓名
+        public DateTime? BirthDay { get; set; }
+        public string Address { get; set; }   // 地址
+        public string ContactInfo { get; set; } // 联系方式
+    }
+
 }

OASystem/OASystem.Domain/Entities/Customer/Crm_VisaCustomerCompany.cs

@@ -46,12 +46,12 @@ namespace OASystem.Domain.Entities.Customer
         /// 雇佣起始年月日
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime WorkStart { get; set; }
+        public DateTime? WorkStart { get; set; }
         /// <summary>
         /// 雇佣结束年月日
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime WorkEnd { get; set; }
+        public DateTime? WorkEnd { get; set; }
         /// <summary>
         /// 工作职责及内容简述
         /// </summary>

OASystem/OASystem.Domain/Entities/Customer/Crm_VisaCustomerFamily.cs

@@ -29,7 +29,7 @@ namespace OASystem.Domain.Entities.Customer
         /// 家庭成员出生日期
         /// </summary>
         [SugarColumn(IsNullable =true,ColumnDataType ="DateTime")]
-        public DateTime BirthDay { get; set; }
+        public DateTime? BirthDay { get; set; }
         /// <summary>
         /// 家庭成员出生地
         /// </summary>
@@ -85,5 +85,37 @@ namespace OASystem.Domain.Entities.Customer
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int IsUSA { get; set; }
+
+        /* 新增字段 */
+        /// <summary>
+        /// 婚姻状态
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string MaritalStatus { get; set; }
+
+        /// <summary>
+        /// 现国籍
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CurrentNationality { get; set; }
+
+        /// <summary>
+        /// 出生国
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CountryOfBirth { get; set; }
+
+        /// <summary>
+        /// 现居住国
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CurrentResidenceCountry { get; set; }
+
+        /// <summary>
+        /// 现职务
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string CurrentOccupation { get; set; }
+
     }
 }

OASystem/OASystem.Domain/Entities/Customer/Crm_VisaCustomerSchool.cs

@@ -47,11 +47,11 @@ namespace OASystem.Domain.Entities.Customer
         /// 就读起始日
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime StudyStart { get; set; }
+        public DateTime? StudyStart { get; set; }
         /// <summary>
         /// 就读结束日
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime StudyEnd { get; set; }
+        public DateTime? StudyEnd { get; set; }
     }
 }

OASystem/OASystem.Domain/OASystem.Domain.csproj

@@ -31,4 +31,8 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.3.32" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="ViewModels\VisaFormDetails\" />
+  </ItemGroup>
+
 </Project>

OASystem/OASystem.Domain/ViewModels/VisaFormDetails/AusNewVisaApplicationForm.cs

@@ -1,182 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OASystem.Domain.ViewModels.VisaFormDetails
-{
-    /// <summary>
-    /// 澳大利亚新签证申请表
-    /// </summary>
-    public class AusNewVisaApplicationForm
-    {
-        // 是否曾经去过其他国家
-        ///<summary>是否曾经去过其他国家</summary>
-        public List<CountryVisit> CountryVisits { get; set; }
-
-        // 申请人的个人信息
-        ///<summary>姓名</summary>
-        public string Name { get; set; }
-        ///<summary>曾用名</summary>
-        public string Alias { get; set; }
-        ///<summary>婚姻状况</summary>
-        public string MaritalStatus { get; set; }
-        ///<summary>出生地</summary>
-        public string BirthPlace { get; set; }
-        ///<summary>性别</summary>
-        public string Gender { get; set; }
-        ///<summary>手机</summary>
-        public string Mobile { get; set; }
-        ///<summary>出生日期</summary>
-        public string BirthDate { get; set; }
-        ///<summary>现在住址</summary>
-        public string CurrentAddress { get; set; }
-
-        ///<summary>在职人员信息</summary>
-        public EmploymentInfo EmploymentInfo { get; set; }
-
-        ///<summary>申请人家庭成员</summary>
-        public List<FamilyMember> FamilyMembers { get; set; }
-
-        ///<summary>关系信息</summary>
-        public List<Relation> Relations { get; set; }
-
-        ///<summary>拒签历史</summary>
-        public List<Rejection> Rejections { get; set; }
-
-        ///<summary>新西兰/澳大利亚旅行历史</summary>
-        public List<TravelHistory> TravelHistories { get; set; }
-
-        ///<summary>教育经历</summary>
-        public List<Education> Educations { get; set; }
-
-        ///<summary>工作经历</summary>
-        public List<WorkExperience> WorkExperiences { get; set; }
-
-        ///<summary>服兵役历史</summary>
-        public List<MilitaryService> MilitaryServices { get; set; }
-
-    }
-
-    public class CountryVisit
-    {
-        ///<summary>国家</summary>
-        public string Country { get; set; }
-        ///<summary>访问日期</summary>
-        public string VisitDate { get; set; }
-    }
-
-    public class TravelHistory
-    {
-        public int Order { get; set; } // 次序
-        public string ArrivalDate { get; set; }   // 抵达日期
-        public string DepartureDate { get; set; } // 离开日期
-    }
-
-    public class EmploymentInfo
-    {
-        ///<summary>现单位名称</summary>
-        public string CompanyName { get; set; }
-        ///<summary>现单位地址</summary>
-        public string CompanyAddress { get; set; }
-        ///<summary>单位电话</summary>
-        public string CompanyPhone { get; set; }
-        ///<summary>目前职位</summary>
-        public string Position { get; set; }
-        ///<summary>月收入</summary>
-        public decimal MonthlyIncome { get; set; }
-        ///<summary>赴新费用</summary>
-        public string TravelCostType { get; set; }
-        ///<summary>负责人姓名</summary>
-        public string ResponsiblePersonName { get; set; }
-        ///<summary>负责人电话</summary>
-        public string ResponsiblePersonPhone { get; set; }
-    }
-
-    public class FamilyMember
-    {
-        ///<summary>关系</summary>
-        public string Relation { get; set; }
-        ///<summary>姓名</summary>
-        public string Name { get; set; }
-        ///<summary>出生日期</summary>
-        public string BirthDate { get; set; }
-        ///<summary>婚姻状况</summary>
-        public string MaritalStatus { get; set; }
-        ///<summary>现国籍</summary>
-        public string CurrentNationality { get; set; }
-        ///<summary>出生国</summary>
-        public string BirthCountry { get; set; }
-        ///<summary>居住国</summary>
-        public string CesidenceCountry { get; set; }
-        ///<summary>现职务</summary>
-        public string CurrentPosition { get; set; }
-    }
-
-    public class Relation
-    {
-        ///<summary>关系类型</summary>
-        public string RelationType { get; set; }
-        ///<summary>姓名</summary>
-        public string Name { get; set; }
-        ///<summary>出生日期</summary>
-        public string BirthDate { get; set; }
-        ///<summary>地址</summary>
-        public string Address { get; set; }
-        ///<summary>联系方式</summary>
-        public string Contact { get; set; }
-    }
-
-    public class Rejection
-    {
-        ///<summary>国家</summary>
-        public string Country { get; set; }
-        ///<summary>申请日期</summary>
-        public string ApplicationDate { get; set; }
-        ///<summary>申请地点</summary>
-        public string ApplicationLocation { get; set; }
-        ///<summary>申请签证类别</summary>
-        public string VisaCategory { get; set; }
-        ///<summary>拒签原因</summary>
-        public string Reason { get; set; }
-    }
-
-    public class Education
-    {
-        ///<summary>院校名称</summary>
-        public string SchoolName { get; set; }
-        ///<summary>入学时间</summary>
-        public string EnrollmentDate { get; set; }
-        ///<summary>毕业时间</summary>
-        public string GraduationDate { get; set; }
-        ///<summary>课程专业名称</summary>
-        public string Major { get; set; }
-    }
-
-    public class WorkExperience
-    {
-        ///<summary>单位名称</summary>
-        public string CompanyName { get; set; }
-        ///<summary>开始时间</summary>
-        public string StartDate { get; set; }
-        ///<summary>结束时间</summary>
-        public string EndDate { get; set; }
-        ///<summary>单位所在地</summary>
-        public string Location { get; set; }
-        ///<summary>职务</summary>
-        public string Position { get; set; }
-    }
-
-    public class MilitaryService
-    {
-        ///<summary>军衔</summary>
-        public string Rank { get; set; }
-        ///<summary>所属部队</summary>
-        public string Unit { get; set; }
-        ///<summary>军种</summary>
-        public string Branch { get; set; }
-        ///<summary>服役时间</summary>
-        public string ServiceDate { get; set; }
-    }
-}

OASystem/OASystem.Infrastructure/Repositories/CRM/VisaDeleClientRepository.cs

@@ -1,22 +1,13 @@
 
 using AutoMapper;
-using Newtonsoft.Json;
 using OASystem.Domain;
 using OASystem.Domain.AesEncryption;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Dtos.CRM;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.Domain.Entities.Customer;
-using OASystem.Domain.Entities.Groups;
-using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels.CRM;
-using OASystem.Domain.ViewModels.Groups;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Intrinsics.X86;
-using System.Text;
-using System.Threading.Tasks;
+using System.Reflection;
 
 namespace OASystem.Infrastructure.Repositories.CRM
 {
@@ -27,11 +18,11 @@ namespace OASystem.Infrastructure.Repositories.CRM
     {
         private readonly IMapper _mapper;
         private readonly JsonView _jv = new() { Code = StatusCodes.Status400BadRequest, Msg = "操作失败!" };
-        public VisaDeleClientRepository(SqlSugarClient sqlSugar,IMapper mapper) :
+        public VisaDeleClientRepository(SqlSugarClient sqlSugar, IMapper mapper) :
             base(sqlSugar)
         {
             this._mapper = mapper;
-           
+
         }
 
         /// <summary>
@@ -42,7 +33,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
         public async Task<Result> GetCrmList(DtoBase dto)
         {
             Result result = new Result() { Code = -2 };
-            if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3) 
+            if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3)
             {
                 string sql = string.Format(@"Select cdc.Id,cdc.LastName,cdc.FirstName,ccc.CompanyFullName,Sex,Marriage,
                                              	    Phone LandlinePhone,Tel,crmCard1.CertNo IDNo,crmCard2.CertNo PassportNo
@@ -94,7 +85,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
         {
             int addId = -1;
 
-            
+
 
 
             return addId;
@@ -112,7 +103,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
             string clientSql = string.Format(@"Select * From Crm_DeleClient Where LastName+FirstName='{0}' And Sex = {1}",
                                              client.ClientName, client.Sex);
             var clientInfo = await _sqlSugar.SqlQueryable<VisaDeleClientListView>(clientSql).FirstAsync();
-            if(clientInfo == null) return false;
+            if (clientInfo == null) return false;
 
             string cardSql = string.Format(@"Select * From Crm_CustomerCert Where SdId=773 And DcId={0}", clientInfo.Id);
             var cardInfo = await _sqlSugar.SqlQueryable<CustomerCertView>(cardSql).FirstAsync();
@@ -151,23 +142,23 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 if (cerdStatus > 0) return true;
             }
 
-            
+
             return false;
         }
 
         public async Task<Result> OpCustomer(DeleClientOpDto dto)
         {
-           Result result = new Result() { Code = -2, Msg = "未知错误" };
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
             try
             {
                 EncryptionProcessor.EncryptProperties(dto.DeleClient);
 
                 BeginTran();
                 int deleId = 0;
-                if (dto.Status==1)//添加
+                if (dto.Status == 1)//添加
                 {
                     string selectSql = string.Format(@"select * from Crm_DeleClient where  LastName+FirstName='{0}' and Phone='{1}' and IsDel='{2}'"
-                                                      , dto.DeleClient.LastName+dto.DeleClient.FirstName, dto.DeleClient.Phone, 0);
+                                                      , dto.DeleClient.LastName + dto.DeleClient.FirstName, dto.DeleClient.Phone, 0);
                     var DeleClient = await _sqlSugar.SqlQueryable<Crm_DeleClient>(selectSql).FirstAsync();//查询是否存在
                     if (DeleClient != null)
                     {
@@ -185,12 +176,12 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         }
                         result = new Result() { Code = 0, Msg = "添加成功！" };
                         deleId = id;
-                        
+
                     }
                 }
                 else if (dto.Status == 2)//修改
                 {
-                    deleId=dto.DeleClient.Id;
+                    deleId = dto.DeleClient.Id;
 
                     DateTime? dateTime = null;
                     bool isDt = DateTime.TryParse(dto.DeleClient.BirthDay, out DateTime dt);
@@ -297,7 +288,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         result = new Result() { Code = -1, Msg = "修改失败！" };
                     }
                     result = new Result() { Code = 0, Msg = "修改成功！" };
-                    
+
                 }
                 //进行其他表
                 if (result.Code == 0)
@@ -326,7 +317,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                                 IsUSA = Crm_VisaCustomerFamily.IsUSA,
                                 Remark = Crm_VisaCustomerFamily.Remark,
                             }).ExecuteCommandAsync();
-                            if (res==0)
+                            if (res == 0)
                             {
                                 result = new Result() { Code = -1, Msg = "家庭成员信息保存失败！" };
                                 RollbackTran();
@@ -334,7 +325,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         }
                         else if (item.Id == 0)//添加
                         {
-                           int sss= await _sqlSugar.Insertable(Crm_VisaCustomerFamily).ExecuteReturnIdentityAsync();
+                            int sss = await _sqlSugar.Insertable(Crm_VisaCustomerFamily).ExecuteReturnIdentityAsync();
                             if (sss == 0)
                             {
                                 result = new Result() { Code = -1, Msg = "家庭成员信息保存失败！" };
@@ -352,7 +343,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         {
                             int res = await _sqlSugar.Updateable<Crm_CustomerCert>().Where(a => a.Id == CustomerCert.Id).SetColumns(a => new Crm_CustomerCert
                             {
-                                DcId=CustomerCert.DcId,
+                                DcId = CustomerCert.DcId,
                                 SdId = CustomerCert.SdId,
                                 CertNo = CustomerCert.CertNo,
                                 Country = CustomerCert.Country,
@@ -389,7 +380,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                         {
                             int res = await _sqlSugar.Updateable<Crm_VisaCustomerCompany>().Where(a => a.Id == VisaCustomerCompany.Id).SetColumns(a => new Crm_VisaCustomerCompany
                             {
-                                DcId=VisaCustomerCompany.DcId,
+                                DcId = VisaCustomerCompany.DcId,
                                 Company = VisaCustomerCompany.Company,
                                 CompanyAddress = VisaCustomerCompany.CompanyAddress,
                                 Phone = VisaCustomerCompany.Phone,
@@ -469,11 +460,11 @@ namespace OASystem.Infrastructure.Repositories.CRM
             Result result = new Result() { Code = -2, Msg = "未知错误" };
             try
             {
-                bool isOk=await SoftDeleteByIdAsync<Crm_DeleClient>(dto.Id.ToString(),dto.DeleteUserId);
+                bool isOk = await SoftDeleteByIdAsync<Crm_DeleClient>(dto.Id.ToString(), dto.DeleteUserId);
                 if (isOk)//删除其他表数据
                 {
                     //客户工作经历
-                    await _sqlSugar.Updateable<Crm_VisaCustomerCompany>().Where(a => a.DcId==dto.Id).SetColumns(a => new Crm_VisaCustomerCompany()
+                    await _sqlSugar.Updateable<Crm_VisaCustomerCompany>().Where(a => a.DcId == dto.Id).SetColumns(a => new Crm_VisaCustomerCompany()
                     {
                         IsDel = 1,
                         DeleteUserId = dto.DeleteUserId,
@@ -511,7 +502,6 @@ namespace OASystem.Infrastructure.Repositories.CRM
             return result;
         }
 
-
         #region 签证客户资料 New 2025-06-04