Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -11,6 +11,7 @@ namespace OASystem.API.Controllers
     [Route("api/[controller]/[action]")]
     public class SystemController : ControllerBase
     {
+      
         private readonly CompanyRepository _syscomRep;
         private readonly DepartmentRepository _sysDepRep;
         private readonly UsersRepository _userRep;
@@ -26,7 +27,11 @@ namespace OASystem.API.Controllers
         }
 
         #region user 操作
-
+        /// <summary>
+        /// 查询所有员工（web）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetUserList(DtoBase dto)
@@ -68,7 +73,7 @@ namespace OASystem.API.Controllers
                 }
                 else if (dto.PortType == 2)
                 {
-                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyIView>(a=>a.ToBool(true)).ToList();
+                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyView>(a=>a.ToBool(true)).ToList();
                     if (companyList.Count == 0)
                     {
                         return Ok(JsonView(false, "暂无数据！"));
@@ -91,13 +96,103 @@ namespace OASystem.API.Controllers
             }
         }
 
+        /// <summary>
+        /// 添加企业数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView),StatusCodes.Status200OK)]
         public async Task<IActionResult> AddCompany(AddCompanyDto dto)
         {
-            Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
-            int id = await _syscomRep.AddAsyncReturnId(_Company);
-            return Ok(JsonView(0, "成功", _Company));
+            if (string.IsNullOrWhiteSpace(dto.CompanyName) || dto.CreateUserId==0 || !string.IsNullOrWhiteSpace(dto.CompanyCode))
+            {
+                return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
+            }
+            else if (string.IsNullOrWhiteSpace(dto.Tel))
+            {
+                return Ok(JsonView(-1, "请检查联系方式是否输入正确！", null));
+            }
+            else
+            {
+                Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
+                int id = await _syscomRep.AddAsyncReturnId(_Company);
+                if (id == 0)
+                {
+                    return Ok(JsonView(-1, "添加失败！", null));
+
+                }
+                return Ok(JsonView(0, "成功", id));
+            }
+            
+        }
+
+        /// <summary>
+        /// 企业修改
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult>EditCompany(EditCompanyDto dto)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address) || dto.ParentCompanyId == 0 || dto.ContactUserId == 0)
+                {
+                    return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
+                }
+                else if (string.IsNullOrWhiteSpace(dto.Tel))
+                {
+                    return Ok(JsonView(-1, "请检查联系方式是否输入正确！", null));
+                }
+                else
+                {
+                    bool res = await _syscomRep.UpdateAsync(a => a.Id == dto.Id, a => new Sys_Company
+                    {
+                        CompanyName = dto.CompanyName,
+                        CompanyCode = dto.CompanyCode,
+                        Address = dto.Address,
+                        ParentCompanyId = dto.ParentCompanyId,
+                        Tel = dto.Tel,
+                        ContactUserId = dto.ContactUserId,
+                    });
+                    if (!res) { return Ok(JsonView(-1, "失败", null)); }
+                    return Ok(JsonView(0, "成功", null));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+            
+            
+        }
+
+         /// <summary>
+        /// 企业删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelCompany(DelCompanyDto dto)
+        {
+            try
+            {
+                bool res = await _syscomRep.SoftDeleteAsync<Sys_Company>(dto.Id.ToString());
+                if (!res) { return Ok(JsonView(-1, "失败", null)); }
+                return Ok(JsonView(0, "成功", null));
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+           
+            
+
         }
         #endregion
 

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -17,8 +17,9 @@ namespace OASystem.Domain.AutoMappers
             #endregion
 
             #region 公司板块
-            CreateMap<Sys_Company, CompanyIView>();
+            CreateMap<Sys_Company, CompanyView>();
             CreateMap<AddCompanyDto, Sys_Company>();
+            CreateMap<EditCompanyDto, Sys_Company>();
             #endregion
 
             #region 部门板块

OASystem/OASystem.Domain/Dtos/System/CompanyDto.cs

@@ -15,28 +15,23 @@ namespace OASystem.Domain.Dtos.System
         /// <summary>
         /// 公司Code
         /// </summary>
-
         public string CompanyCode { get; set; }
         /// <summary>
         /// 公司名称
         /// </summary>
-
         public string CompanyName { get; set; }
 
         /// <summary>
         /// 公司所在地
         /// </summary>
-
         public string Address { get; set; }
         /// <summary>
         /// 负责人Id
         /// </summary>
-
         public int ContactUserId { get; set; }
         /// <summary>
         /// 联系方式
         /// </summary>
-
         private string tel;
         public string Tel
         {
@@ -46,7 +41,15 @@ namespace OASystem.Domain.Dtos.System
             }
             set
             {
-                tel = value;
+                if (Regex.IsMatch(value, @"^[1]+[2,3,4,5,6,7,8,9]+\d{9}"))
+                {
+                    tel = value;
+                }
+                else
+                {
+                    tel = "";
+                }
+               
             }
         }
         /// <summary>
@@ -60,4 +63,68 @@ namespace OASystem.Domain.Dtos.System
 
         public int CreateUserId { get; set; }
     }
+
+    /// <summary>
+    /// 修改企业dto
+    /// </summary>
+    public class EditCompanyDto
+    {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 公司Code
+        /// </summary>
+        public string CompanyCode { get; set; }
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
+
+        /// <summary>
+        /// 公司所在地
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 负责人Id
+        /// </summary>
+        public int ContactUserId { get; set; }
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        private string tel;
+        public string Tel
+        {
+            get
+            {
+                return tel;
+            }
+            set
+            {
+                if (Regex.IsMatch(value, @"^[1]+[2,3,4,5,6,7,8,9]+\d{9}"))
+                {
+                    tel = value;
+                }
+                else
+                {
+                    tel = "";
+                }
+
+            }
+        }
+        /// <summary>
+        /// 父级公司Id
+        /// </summary>
+        public int ParentCompanyId { get; set; }
+
+    }
+
+    /// <summary>
+    /// 删除企业dto
+    /// </summary>
+    public class DelCompanyDto
+    {
+        public int Id { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/System/Sys_Company.cs

@@ -39,61 +39,5 @@
         public int ParentCompanyId { get; set; }
     }
 
-    /// <summary>
-    /// 添加公司表数据
-    /// </summary>
-    public class AddCompany
-    {
-        /// <summary>
-        /// 公司Code
-        /// </summary>
-        
-        public string CompanyCode { get; set; }
-        /// <summary>
-        /// 公司名称
-        /// </summary>
-        public string CompanyName { get; set; }
-
-        /// <summary>
-        /// 公司所在地
-        /// </summary>
-        public string Address { get; set; }
-        /// <summary>
-        /// 负责人Id
-        /// </summary>
-        public int ContactUserId { get; set; }
-        /// <summary>
-        /// 联系方式
-        /// </summary>
-        public string Tel { get; set; }
-        /// <summary>
-        /// 父级公司Id
-        /// </summary>
-        public int ParentCompanyId { get; set; }
-
-        /// <summary>
-        /// 创建者Id
-        /// </summary>
-        public int CreateUserId { get; set; }
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; } = DateTime.Now;
-        /// <summary>
-        /// 删除者Id
-        /// </summary>
-        public int? DeleteUserId { get; set; }
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        public string DeleteTime { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-        /// <summary>
-        /// 是否删除
-        /// </summary>
-        public int IsDel { get; set; }
-    }
+    
 }

OASystem/OASystem.Domain/ViewModels/CompanyView.cs

@@ -10,7 +10,7 @@ namespace OASystem.Domain.ViewModels
     /// <summary>
     /// 公司视图表（返回数据model）安卓端
     /// </summary>
-    public class CompanyIView
+    public class CompanyView
     {
         /// <summary>
         /// 公司Id

OASystem/OASystem.Infrastructure/Repositories/System/CompanyRepository.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class CompanyRepository : BaseRepository<Sys_Company, CompanyIView>
+    public class CompanyRepository : BaseRepository<Sys_Company, CompanyView>
     {
         public CompanyRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {