客户工作经历及学历编写

OASystem/OASystem.Api/Controllers/CRMController.cs

@@ -191,5 +191,31 @@ namespace OASystem.API.Controllers
             }
             return Ok(JsonView(false, "程序错误！"));
         }
+
+        /// <summary>
+        /// 客户资料操作删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult>DelCustomer(DeleClientDelDto dto)
+        {
+            try
+            {
+                Result result = await _clientRepository.DelCustomer(dto);
+                if (result.Code != 0)
+                {
+                    return Ok(JsonView(false, result.Msg));
+                }
+                return Ok(JsonView(true, result.Msg));
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+            return Ok(JsonView(false, "程序错误！"));
+        }
     }
 }

OASystem/OASystem.Api/Controllers/TencentOCRController.cs

@@ -1,5 +1,4 @@
 using OASystem.API.OAMethodLib.File;
-using OASystem.API.OAMethodLib.NPOI;
 using OASystem.API.OAMethodLib.TencentCloudAPI;
 using OASystem.Domain.Dtos.CRM;
 using OASystem.Domain.Dtos.Tencent;

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -124,6 +124,8 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<DeleClient, Crm_DeleClient>();
             CreateMap<CustomerFamily,Crm_VisaCustomerFamily>();
             CreateMap<CustomerCerts, Crm_CustomerCert>();
+            CreateMap<VisaCustomerCompany, Crm_VisaCustomerCompany>();
+            CreateMap<VisaCustomerSchool,Crm_VisaCustomerSchool>();
             #endregion
             #endregion
 

OASystem/OASystem.Domain/Dtos/CRM/DeleClientAddDto.cs

@@ -22,6 +22,10 @@ namespace OASystem.Domain.Dtos.CRM
         public List<CustomerFamily> CustomerFamily { get; set; }
 
         public List<CustomerCerts> CustomerCert { get; set; }
+
+        public List<VisaCustomerCompany> WorkExperience { get; set; }
+
+        public List<VisaCustomerSchool> CustomerSchool { get; set; }
     } 
     /// <summary>
     /// 客户资料修改
@@ -641,6 +645,116 @@ namespace OASystem.Domain.Dtos.CRM
         public string Remark { get; set; }
         
     }
+
+    /// <summary>
+    /// 客户工作经历表
+    /// </summary>
+    public class VisaCustomerCompany
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 客户表ID
+        /// </summary>
+        public int DcId { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string Company { get; set; }
+        /// <summary>
+        /// 公司地址
+        /// </summary>
+        public string CompanyAddress { get; set; }
+        /// <summary>
+        /// 公司电话
+        /// </summary>
+        public string Phone { get; set; }
+        /// <summary>
+        /// 职务
+        /// </summary>
+        public string Job { get; set; }
+        /// <summary>
+        /// 主管名字
+        /// </summary>
+        public string LeaderName { get; set; }
+        /// <summary>
+        /// 雇佣起始年月日
+        /// </summary>
+        public DateTime WorkStart { get; set; }
+        /// <summary>
+        /// 雇佣结束年月日
+        /// </summary>
+        public DateTime WorkEnd { get; set; }
+        /// <summary>
+        /// 工作职责及内容简述
+        /// </summary>
+        public string WorkState { get; set; }
+       
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+    }
+
+    /// <summary>
+    /// 客户学历表
+    /// </summary>
+    public class VisaCustomerSchool
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 客户表ID
+        /// </summary>
+        public int DcId { get; set; }
+        /// <summary>
+        /// 学校名称和学历
+        /// </summary>
+        public string School { get; set; }
+        /// <summary>
+        /// 学校地址
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 指导老师
+        /// </summary>
+        public string Teacher { get; set; }
+        /// <summary>
+        /// 学历
+        /// </summary>
+        public string Education { get; set; }
+
+        /// <summary>
+        /// 所学课程或专业名称
+        /// </summary>
+        public string Subject { get; set; }
+        /// <summary>
+        /// 就读起始日
+        /// </summary>
+        public DateTime StudyStart { get; set; }
+        /// <summary>
+        /// 就读结束日
+        /// </summary>
+        public DateTime StudyEnd { get; set; }
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+
     public class SetCrmUpdPassIdCardOCRDto
     {
         public int UserId { get; set; }
@@ -661,4 +775,13 @@ namespace OASystem.Domain.Dtos.CRM
     {
         public int Id { get; set; }
     }
+
+    /// <summary>
+    /// 删除客户资料
+    /// </summary>
+    public class DeleClientDelDto
+    {
+        public int Id { get; set; }
+        public int DeleteUserId { get; set; }
+    }
 }

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

@@ -13,6 +13,7 @@ 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;
 
@@ -46,7 +47,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                                              From Crm_DeleClient cdc
                                              Left Join Crm_CustomerCompany ccc On cdc.crmCompanyId = ccc.Id
                                              Left Join Crm_CustomerCert crmCard1 On crmCard1.SdId = 773 And  cdc.Id = crmCard1.DcId 
-                                             Left Join Crm_CustomerCert crmCard2 On crmCard2.SdId = 774 And  cdc.Id = crmCard2.DcId ");
+                                             Left Join Crm_CustomerCert crmCard2 On crmCard2.SdId = 774 And  cdc.Id = crmCard2.DcId  where cdc.IsDel='0' order By cdc.CreateTime desc");
 
                 var clientList = await _sqlSugar.SqlQueryable<VisaDeleClientListView>(sql).ToListAsync();
 
@@ -281,7 +282,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
                     result = new Result() { Code = 0, Msg = "修改成功！" };
                     
                 }
-                //进行其他表炒作
+                //进行其他表
                 if (result.Code == 0)
                 {//家庭成员信息
                     foreach (CustomerFamily item in dto.CustomerFamily)
@@ -308,10 +309,18 @@ namespace OASystem.Infrastructure.Repositories.CRM
                                 IsUSA = Crm_VisaCustomerFamily.IsUSA,
                                 Remark = Crm_VisaCustomerFamily.Remark,
                             }).ExecuteCommandAsync();
+                            if (res==0)
+                            {
+                                result = new Result() { Code = -1, Msg = "家庭成员信息保存失败！" };
+                            }
                         }
                         else if (item.Id == 0)//添加
                         {
                            int sss= await _sqlSugar.Insertable(Crm_VisaCustomerFamily).ExecuteReturnIdentityAsync();
+                            if (sss == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "家庭成员信息保存失败！" };
+                            }
                         }
                     }
 
@@ -336,17 +345,139 @@ namespace OASystem.Infrastructure.Repositories.CRM
                                 CreateUserId = CustomerCert.CreateUserId,
                                 Remark = CustomerCert.Remark,
                             }).ExecuteCommandAsync();
+                            if (res == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "证件信息保存失败！" };
+                            }
                         }
                         else if (item.Id == 0)//添加
                         {
                             int sss = await _sqlSugar.Insertable(CustomerCert).ExecuteReturnIdentityAsync();
+                            if (sss == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "证件信息保存失败！" };
+                            }
+                        }
+                    }
+                    //客户工作经历表
+                    foreach (VisaCustomerCompany item in dto.WorkExperience)
+                    {
+                        Crm_VisaCustomerCompany VisaCustomerCompany = _mapper.Map<Crm_VisaCustomerCompany>(item);
+                        VisaCustomerCompany.DcId = deleId;
+                        if (item.Id != 0)//修改
+                        {
+                            int res = await _sqlSugar.Updateable<Crm_VisaCustomerCompany>().Where(a => a.Id == VisaCustomerCompany.Id).SetColumns(a => new Crm_VisaCustomerCompany
+                            {
+                                DcId=VisaCustomerCompany.DcId,
+                                Company = VisaCustomerCompany.Company,
+                                CompanyAddress = VisaCustomerCompany.CompanyAddress,
+                                Phone = VisaCustomerCompany.Phone,
+                                Job = VisaCustomerCompany.Job,
+                                LeaderName = VisaCustomerCompany.LeaderName,
+                                WorkStart = VisaCustomerCompany.WorkStart,
+                                WorkEnd = VisaCustomerCompany.WorkEnd,
+                                WorkState = VisaCustomerCompany.WorkState,
+                                CreateUserId = VisaCustomerCompany.CreateUserId,
+                                Remark = VisaCustomerCompany.Remark,
+                            }).ExecuteCommandAsync();
+                            if (res == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "客户工作经历保存失败！" };
+                            }
+                        }
+                        else if (item.Id == 0)//添加
+                        {
+                            int sss = await _sqlSugar.Insertable(VisaCustomerCompany).ExecuteReturnIdentityAsync();
+                            if (sss == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "客户工作经历保存失败！" };
+                            }
+                        }
+                    }
+                    //客户学历表
+                    foreach (VisaCustomerSchool item in dto.CustomerSchool)
+                    {
+                        Crm_VisaCustomerSchool VisaCustomerSchool = _mapper.Map<Crm_VisaCustomerSchool>(item);
+                        VisaCustomerSchool.DcId = deleId;
+                        if (item.Id != 0)//修改
+                        {
+                            int res = await _sqlSugar.Updateable<Crm_VisaCustomerSchool>().Where(a => a.Id == VisaCustomerSchool.Id).SetColumns(a => new Crm_VisaCustomerSchool
+                            {
+                                DcId = VisaCustomerSchool.DcId,
+                                School = VisaCustomerSchool.School,
+                                Address = VisaCustomerSchool.Address,
+                                Teacher = VisaCustomerSchool.Teacher,
+                                Education = VisaCustomerSchool.Education,
+                                Subject = VisaCustomerSchool.Subject,
+                                StudyStart = VisaCustomerSchool.StudyStart,
+                                StudyEnd = VisaCustomerSchool.StudyEnd,
+                                CreateUserId = VisaCustomerSchool.CreateUserId,
+                                Remark = VisaCustomerSchool.Remark,
+                            }).ExecuteCommandAsync();
+                            if (res == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "客户学历信息保存失败！" };
+                            }
+                        }
+                        else if (item.Id == 0)//添加
+                        {
+                            int sss = await _sqlSugar.Insertable(VisaCustomerSchool).ExecuteReturnIdentityAsync();
+                            if (sss == 0)
+                            {
+                                result = new Result() { Code = -1, Msg = "客户学历信息保存失败！" };
+                            }
                         }
                     }
                 }
+            }
+            catch (Exception ex)
+            {
+                return result = new Result() { Code = -2, Msg = "程序错误！" };
+                throw;
+            }
+            return result;
+        }
 
-
+        public async Task<Result> DelCustomer(DeleClientDelDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                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()
+                    {
+                        IsDel = 1,
+                        DeleteUserId = dto.DeleteUserId,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                    }).ExecuteCommandAsync();
+                    //客户学历
+                    await _sqlSugar.Updateable<Crm_VisaCustomerSchool>().Where(a => a.DcId == dto.Id).SetColumns(a => new Crm_VisaCustomerSchool()
+                    {
+                        IsDel = 1,
+                        DeleteUserId = dto.DeleteUserId,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                    }).ExecuteCommandAsync();
+                    //客户家庭成员信息
+                    await _sqlSugar.Updateable<Crm_VisaCustomerFamily>().Where(a => a.DcId == dto.Id).SetColumns(a => new Crm_VisaCustomerFamily()
+                    {
+                        IsDel = 1,
+                        DeleteUserId = dto.DeleteUserId,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                    }).ExecuteCommandAsync();
+                    //客户证件表
+                    await _sqlSugar.Updateable<Crm_CustomerCert>().Where(a => a.DcId == dto.Id).SetColumns(a => new Crm_CustomerCert()
+                    {
+                        IsDel = 1,
+                        DeleteUserId = dto.DeleteUserId,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                    }).ExecuteCommandAsync();
+                    return result = new Result() { Code = 0, Msg = "删除成功！" };
+                }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 return result = new Result() { Code = -2, Msg = "程序错误！" };
                 throw;