修改岗位返回参数

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -23,6 +23,7 @@ namespace OASystem.API.Controllers
         private readonly SystemMenuAndFunctionRepository _SystemMenuAndFunctionRepository;
         private readonly JobPostAuthorityRepository _JobPostAuthorityRepository;
         private readonly JobPostRepository _jobRep;
+
         private readonly UserAuthorityRepository _UserAuthorityRepository;
 
         public SystemController( CompanyRepository syscom, DepartmentRepository sysDepRep, UsersRepository userRep,
@@ -43,6 +44,7 @@ namespace OASystem.API.Controllers
             _SystemMenuAndFunctionRepository = systemMenuAndFunctionRepository;
             _JobPostAuthorityRepository = jobPostAuthorityRepository;
             _UserAuthorityRepository = userAuthorityRepository;
+            _jobRep = jobRep;
         }
 
         #region 企业操作
@@ -434,12 +436,28 @@ namespace OASystem.API.Controllers
             {
                 if (dto.PortType == 1)
                 {
-                    var result = _sysDepRep.QueryDto<Sys_JobPost, JobPostView>(s => s.CompanyId == dto.CompanyId && s.DepId == dto.DepId).ToList();
-                    if (result.Count == 0)
+                    string sqlWhere = string.Empty;
+                    if (dto.CompanyId != 0)
+                    {
+                        sqlWhere += string.Format(@" And jp.CompanyId={0}", dto.CompanyId);
+                    }
+                    if (dto.DepId != 0)
+                    {
+                        sqlWhere += string.Format(@" And jp.DepId={0}", dto.DepId);
+                    }
+                    if (!string.IsNullOrEmpty(sqlWhere.Trim()))
+                    {
+                        Regex r = new Regex("And");
+                        sqlWhere = r.Replace(sqlWhere, "Where", 1);
+                    }
+                    List<Sys_JobPostI> jobList = await _jobRep.QueryJobPost(sqlWhere);
+
+                    List<JobPostView> List = _mapper.Map<List<JobPostView>>(jobList);
+                    if (jobList.Count == 0)
                     {
                         return Ok(JsonView(false, "暂无数据！"));
                     }
-                    return Ok(JsonView(true, "查询成功！", result));
+                    return Ok(JsonView(true, "查询成功！", jobList));
                 }
                 else if (dto.PortType == 2)
                 {

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -37,6 +37,7 @@ namespace OASystem.Domain.AutoMappers
             #region 岗位板块
             CreateMap<Sys_JobPost, JobPostView>();
             CreateMap<AddJobPostDto,Sys_JobPost>();
+            CreateMap<Sys_JobPostI, JobPostView>();
             #endregion
 
             #region 用户板块

OASystem/OASystem.Domain/Entities/System/Sys_JobPost.cs

@@ -24,5 +24,14 @@ namespace OASystem.Domain.Entities.System
         public string JobName { get; set; }
        
     }
+    #region 附加字段
+
+    #endregion
+    public class Sys_JobPostI:Sys_JobPost
+    {
+        public string CompanyName { get; set; }
+
+        public string DepName { get; set; }
+    }
 
 }

OASystem/OASystem.Domain/ViewModels/System/JobPostView.cs

@@ -24,8 +24,23 @@ namespace OASystem.Domain.ViewModels.System
         /// </summary>
         public int CompanyId { get; set; }
         /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string CompanyName { get; set; }
+        /// <summary>
         /// 部门Id
         /// </summary>
         public int DepId { get; set; }
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public string DepName { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
+
+
 }

OASystem/OASystem.Infrastructure/Repositories/System/JobPostRepository.cs

@@ -1,4 +1,5 @@
 using OASystem.Domain.Dtos.System;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,11 +8,19 @@ using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.System
 {
-    public class JobPostRepository : BaseRepository<Sys_JobPost, QueryJobPostDto>
+    public class JobPostRepository : BaseRepository<Sys_JobPost, JobPostView>
     {
         public JobPostRepository(SqlSugarClient sqlSugar) : base(sqlSugar)
         {
 
         }
+
+        public async Task<List<Sys_JobPostI>> QueryJobPost(string sqlWhere)
+        {
+            string sql = string.Format(@"select jp.*,dep.DepName as 'DepName',cmp.CompanyName as 'CompanyName' from Sys_JobPost jp left join 
+                                                 Sys_Company cmp on jp.CompanyId=cmp.Id left join Sys_Department dep on jp.DepId=dep.Id  {0}", sqlWhere);
+            return await _sqlSugar.SqlQueryable<Sys_JobPostI>(sql).ToListAsync();
+        }
+
     }
 }