员工模块

员工列表 SQL 查询语句
增加查询条件 HrAudit，IsDel

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2622,6 +2622,33 @@ namespace OASystem.API.Controllers
             }
         }
 
+        /// <summary>
+        /// 团组模块 - 出入境费用 - 明细表导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostEnterExitCostExportDetailsList(EnterExitCostOperateDto dto)
+        {
+            try
+            {
+                var data = await _enterExitCostRep.PostEnterExitCostOperate(dto);
+
+                if (data.Code != 0)
+                {
+                    return Ok(JsonView(false, data.Msg));
+                }
+
+                return Ok(JsonView(true, data.Msg, data.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, ex.Message));
+            }
+        }
+
+
+
         /// <summary>
         /// 团组模块 - 出入境费用 - 子项删除
         /// </summary>

OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -218,6 +218,21 @@ namespace OASystem.Domain.Dtos.Groups
 
     }
 
+    /// <summary>
+    /// 出入境费用 - 明细表导出 Dto
+    /// </summary>
+    public class EnterExitCostExportDetailsListDto :PortDtoBase
+    {
+        /// <summary>
+        /// 模板类型
+        /// 1 默认明细表
+        /// 2 因公出国（境）经费测算明细表
+        /// 3 四川省商务厅出国经费财政先行审核表
+        /// </summary>
+        public int ExportType { get; set; }
+    }
+
+
     /// <summary>
     /// 团组模块 - 出入境国家费用标准 Page List
     /// </summary>

OASystem/OASystem.Infrastructure/Repositories/System/UsersRepository.cs

@@ -58,7 +58,8 @@ namespace OASystem.Infrastructure.Repositories.System
                                                       From Sys_Users su 
                                                       Inner Join Sys_Company sc On su.CompanyId = sc.Id
                                                       Inner Join Sys_Department sd On su.DepId = sd.Id
-                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
+                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id 
+                                                      Where su.HrAudit = 1 And su.IsDel = 0");
                 var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
 
                 if (_userList.Count != 0)
@@ -79,7 +80,9 @@ namespace OASystem.Infrastructure.Repositories.System
                                                       From Sys_Users su 
                                                       Inner Join Sys_Company sc On su.CompanyId = sc.Id
                                                       Inner Join Sys_Department sd On su.DepId = sd.Id
-                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
+                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id 
+                                                      Where su.HrAudit = 1 And su.IsDel = 0 ");
+
                 var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
 
                 if (_userList.Count != 0)