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

OASystem/OASystem.Api/Controllers/BaseController.cs

@@ -49,6 +49,17 @@ public class ControllerBase : Microsoft.AspNetCore.Mvc.ControllerBase
             return new JsonView { Code = StatusCodes.Status400BadRequest, Msg = msg };
         }
     }
+    protected virtual JsonView JsonView(bool s, string msg, object obj)
+    {
+        if (s)
+        {
+            return new JsonView { Code = StatusCodes.Status200OK, Msg = msg,Data= obj };
+        }
+        else
+        {
+            return new JsonView { Code = StatusCodes.Status400BadRequest, Msg = msg };
+        }
+    }
     protected virtual JsonView JsonView(int code, string msg, object obj)
     {
         return new JsonView { Code = code, Msg = msg, Data = obj };

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -44,7 +44,7 @@ namespace OASystem.API.Controllers
                     return Ok(JsonView(false, "暂无数据！"));
 
                 }
-                return Ok(JsonView(result.Result.Data));
+                return Ok(JsonView(true,"查询成功！",result.Result.Data));
             }
             catch (Exception)
             {
@@ -73,12 +73,12 @@ namespace OASystem.API.Controllers
                 }
                 else if (dto.PortType == 2)
                 {
-                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyView>(a=>a.ToBool(true)).ToList();
+                    var companyList = _sysDepRep.QueryDto<Sys_Company, CompanyView>(a=>a.IsDel!=null).ToList();
                     if (companyList.Count == 0)
                     {
                         return Ok(JsonView(false, "暂无数据！"));
                     }
-                    return Ok(JsonView(companyList));
+                    return Ok(JsonView(true,"查询成功！",companyList));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -105,25 +105,34 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView),StatusCodes.Status200OK)]
         public async Task<IActionResult> AddCompany(AddCompanyDto dto)
         {
-            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
+            try
             {
-                Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
-                int id = await _syscomRep.AddAsyncReturnId(_Company);
-                if (id == 0)
+                if (string.IsNullOrWhiteSpace(dto.CompanyName) || dto.CreateUserId == 0 || string.IsNullOrWhiteSpace(dto.CompanyCode))
                 {
-                    return Ok(JsonView(-1, "添加失败！", null));
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
+                }
+                else if (string.IsNullOrWhiteSpace(dto.Tel))
+                {
+                    return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
+                }
+                else
+                {
+                    Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
+                    int id = await _syscomRep.AddAsyncReturnId(_Company);
+                    if (id == 0)
+                    {
+                        return Ok(JsonView(false, "添加失败！"));
 
+                    }
+                    return Ok(JsonView(true,"添加成功", new { Id = id }));
                 }
-                return Ok(JsonView(0, "成功", id));
             }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+            
             
         }
 
@@ -140,11 +149,11 @@ namespace OASystem.API.Controllers
             {
                 if (string.IsNullOrWhiteSpace(dto.CompanyName) || string.IsNullOrWhiteSpace(dto.CompanyCode) || string.IsNullOrWhiteSpace(dto.Address) || dto.ParentCompanyId == 0 || dto.ContactUserId == 0)
                 {
-                    return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
                 }
                 else if (string.IsNullOrWhiteSpace(dto.Tel))
                 {
-                    return Ok(JsonView(-1, "请检查联系方式是否输入正确！", null));
+                    return Ok(JsonView(false, "请检查联系方式是否输入正确！"));
                 }
                 else
                 {
@@ -157,8 +166,8 @@ namespace OASystem.API.Controllers
                         Tel = dto.Tel,
                         ContactUserId = dto.ContactUserId,
                     });
-                    if (!res) { return Ok(JsonView(-1, "失败", null)); }
-                    return Ok(JsonView(0, "成功", null));
+                    if (!res) { return Ok(JsonView(false, "修改失败")); }
+                    return Ok(JsonView(true,"修改成功！"));
                 }
             }
             catch (Exception)
@@ -182,8 +191,8 @@ namespace OASystem.API.Controllers
             try
             {
                 bool res = await _syscomRep.SoftDeleteAsync<Sys_Company>(dto.Id.ToString());
-                if (!res) { return Ok(JsonView(-1, "失败", null)); }
-                return Ok(JsonView(0, "成功", null));
+                if (!res) { return Ok(JsonView(false, "删除失败")); }
+                return Ok(JsonView(true, "删除成功"));
             }
             catch (Exception)
             {
@@ -221,7 +230,7 @@ namespace OASystem.API.Controllers
                     {
                         return Ok(JsonView(false, "暂无数据！"));
                     }
-                    return Ok(JsonView(result));
+                    return Ok(JsonView(true,"查询成功！",result));
                 }
                 else if (dto.PortType == 3)
                 {
@@ -238,6 +247,115 @@ namespace OASystem.API.Controllers
                 throw;
             }
          
+        }
+        /// <summary>
+        /// 部门添加
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> AddDepartment(AddDepartmentDto dto)
+        {
+            try
+            {
+                if (dto.CreateUserId == 0 || string.IsNullOrWhiteSpace(dto.DepName) || dto.CompanyId == 0 || string.IsNullOrWhiteSpace(dto.DepCode))
+                {
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
+                }
+                else
+                {
+                    Sys_Department _Department = _mapper.Map<Sys_Department>(dto);
+                    int id = await _sysDepRep.AddAsyncReturnId(_Department);
+                    if (id == 0)
+                    {
+                        return Ok(JsonView(false, "添加失败！"));
+                    }
+                    return Ok(JsonView(true, "添加成功！", new { Id = id }));
+                }
+            }
+            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> EditDepartment(EditDepartmentDto dto)
+        {
+            try
+            {
+                if (dto.Id==0 || string.IsNullOrWhiteSpace(dto.DepName) || dto.CompanyId == 0 || string.IsNullOrWhiteSpace(dto.DepCode))
+                {
+                    return Ok(JsonView(false, "请检查信息是否输入完整！"));
+                }
+                else
+                {
+                    bool res = await _sysDepRep.UpdateAsync<Sys_Department>(a => a.Id == dto.Id, a => new Sys_Department
+                    {
+                        CompanyId=dto.CompanyId,
+                        DepCode=dto.DepCode,
+                        DepName=dto.DepName,
+                        ParentDepId=dto.ParentDepId,
+                        Remark=dto.Remark,
+    });
+                    if (!res)
+                    {
+                        return Ok(JsonView(false, "修改失败！"));
+                    }
+                    return Ok(JsonView(true, "修改成功！"));
+                }
+            }
+            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> DelDepartment(DelDepartmentDto dto)
+        {
+            try
+            {
+                if (dto.Id == 0)
+                {
+                    return Ok(JsonView(-1, "请检查信息是否输入完整！", null));
+                }
+                else
+                {
+                    bool res =await _sysDepRep.SoftDeleteAsync<Sys_Department>(dto.Id.ToString());
+                    if (!res)
+                    {
+                        return Ok(JsonView(false, "删除失败！"));
+                    }
+                    return Ok(JsonView(true, "删除成功！"));
+                }
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+
+
         }
         #endregion
 
@@ -273,7 +391,7 @@ namespace OASystem.API.Controllers
                     return Ok(JsonView(false, "暂无数据！"));
 
                 }
-                return Ok(JsonView(result.Result.Data));
+                return Ok(JsonView(true,"查询成功！",result.Result.Data));
             }
             catch (Exception)
             {

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -24,6 +24,8 @@ namespace OASystem.Domain.AutoMappers
 
             #region 部门板块
             CreateMap<Sys_Department, DepartmentIView>();
+            CreateMap<AddDepartmentDto,Sys_Department>();
+            CreateMap<EditDepartmentDto,Sys_Department>();
             #endregion
 
             #region 用户板块

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

@@ -125,6 +125,9 @@ namespace OASystem.Domain.Dtos.System
     /// </summary>
     public class DelCompanyDto
     {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
         public int Id { get; set; }
     }
 }

OASystem/OASystem.Domain/Dtos/System/DepartmentDto.cs

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.Entities;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -7,6 +8,9 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.Dtos.System
 {
+    /// <summary>
+    /// 查询dto
+    /// </summary>
     public class DepartmentDto:DtoBase
     {
         /// <summary>
@@ -14,4 +18,74 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public int CompanyId { get; set; }
     }
+    /// <summary>
+    /// 添加dto
+    /// </summary>
+    public class AddDepartmentDto
+    {
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门code
+        /// </summary>
+        public string DepCode { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepName { get; set; }
+        /// <summary>
+        /// 父级部门Id
+        /// </summary>
+        public int ParentDepId { get; set; }
+
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string Remark { get; set; }
+       
+    }
+
+    /// <summary>
+    /// 修改dto
+    /// </summary>
+    public class EditDepartmentDto
+    {
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 公司Id
+        /// </summary>
+        public int CompanyId { get; set; }
+        /// <summary>
+        /// 部门code
+        /// </summary>
+        public string DepCode { get; set; }
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepName { get; set; }
+        /// <summary>
+        /// 父级部门Id
+        /// </summary>
+        public int ParentDepId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+    }
+
+    public class DelDepartmentDto
+    {
+        public int Id { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/System/Sys_Department.cs

@@ -27,5 +27,7 @@ namespace OASystem.Domain.Entities.System
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int ParentDepId { get; set; }
+
+
     }
 }