设置工作日

修改 工作日 条件 更改为 按 日期修改

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -62,6 +62,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 工资 工作日信息
+        /// 查询
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -90,6 +91,7 @@ namespace OASystem.API.Controllers
 
         /// <summary>
         /// 工资 工作日信息
+        /// 编辑
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -142,10 +144,11 @@ namespace OASystem.API.Controllers
                 string sql = string.Format("Select * From Pm_WageIssueWorkingDay Where Isdel = 0 And YearMonth='{0}'", dto.YearMonth);
                 var workdsys = await _sqlSugar.SqlQueryable<Pm_WageIssueWorkingDay>(sql).FirstAsync();
 
+                pm_WageIssueWorkingDay.CreateUserId = dto.UserId;
+                pm_WageIssueWorkingDay.IsDel = 0;
+
                 if (workdsys == null) //添加
                 {
-                    pm_WageIssueWorkingDay.CreateUserId = dto.UserId;
-                    pm_WageIssueWorkingDay.IsDel = 0;
 
                     int addId = await _sqlSugar.Insertable(pm_WageIssueWorkingDay).ExecuteReturnIdentityAsync();
                 }
@@ -153,14 +156,14 @@ namespace OASystem.API.Controllers
                 {
                     int updCount = await _sqlSugar.Updateable(pm_WageIssueWorkingDay)
                         .IgnoreColumns(z => new { z.CreateUserId, z.CreateTime, z.DeleteUserId, z.DeleteTime, z.IsDel })
-                        .WhereColumns(it => it.Id)
+                        .WhereColumns(it => it.YearMonth)
                         .ExecuteCommandAsync();
                 }
 
                 List<Sys_Calendar> sys_Calendars_add = new List<Sys_Calendar>();
                 List<Sys_Calendar> sys_Calendars_update = new List<Sys_Calendar>();
-                sys_Calendars_add = sys_Calendars.Where(it => it.Id == 0).ToList();
-                sys_Calendars_update = sys_Calendars.Where(it => it.Id != 0).ToList();
+                sys_Calendars_add = sys_Calendars.Where(it => it.Id == 0).OrderBy(it => it.Dt).ToList();
+                sys_Calendars_update = sys_Calendars.Where(it => it.Id != 0).OrderBy(it => it.Dt).ToList();
 
                 int add1 = 0;
                 int upd = 0;

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -914,7 +914,7 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                string sqlWhere = string.Empty;
+                string sqlWhere = string.Format(" Where su.IsDel = 0 ");
                 if (dto.CompanyId!=0)
                 {
                     sqlWhere += string.Format(@" And su.CompanyId={0}", dto.CompanyId);
@@ -927,11 +927,7 @@ namespace OASystem.API.Controllers
                 {
                     sqlWhere += string.Format(@" And su.JobPostId={0}", dto.JobPostId);
                 }
-                if (!string.IsNullOrEmpty(sqlWhere.Trim()))
-                {
-                    Regex r = new Regex("And");
-                    sqlWhere = r.Replace(sqlWhere, "Where", 1);
-                }
+               
                 List<UserInfo> _userList =await _userRep.QueryUser(sqlWhere);
                 if (_userList.Count == 0)
                 {
@@ -1043,6 +1039,44 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
+
+        /// <summary>
+        /// 删除用户信息
+        /// 即为离职
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostUserDelById(UserDelDto dto)
+        {
+            try
+            {
+                if (dto == null)
+                {
+                    return Ok(JsonView(false, "参数不能为空！"));
+                }
+
+                bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
+                {
+                    IsDel = 1,
+                    DeleteUserId = dto.OperateUserId,
+                    DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    Rdate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
+                });
+                if (!res)
+                {
+                    return Ok(JsonView(false, "操作失败！"));
+                }
+                return Ok(JsonView(true, "操作成功！"));
+
+            }
+            catch (Exception)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+            }
+        }
+
         #endregion
 
         #region 权限模块

OASystem/OASystem.Domain/Dtos/System/UserDto.cs

@@ -200,4 +200,21 @@ namespace OASystem.Domain.Dtos.System
         public string Certificate { get; set; }
 
     }
+
+    /// <summary>
+    /// 删除用户信息
+    /// 即为离职
+    /// </summary>
+    public class UserDelDto : PortDtoBase
+    {
+        /// <summary>
+        /// 数据Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 操作人Id
+        /// </summary>
+        public int OperateUserId { get; set; }
+    }
 }

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

@@ -58,8 +58,7 @@ 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 
-                                                      Where su.HrAudit = 1 And su.IsDel = 0");
+                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id ");
                 var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
 
                 if (_userList.Count != 0)
@@ -80,8 +79,7 @@ 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 
-                                                      Where su.HrAudit = 1 And su.IsDel = 0 ");
+                                                      Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id ");
 
                 var _userList = await _sqlSugar.SqlQueryable<UserInfoWebView>(userSqlWhere).ToListAsync();
 
@@ -146,6 +144,7 @@ namespace OASystem.Infrastructure.Repositories.System
 
             return result;
         }
+
         public async Task<List<UserInfo>> QueryUser(string sqlWhere)
         {
             string sql = string.Format(@"Select sc.CompanyName,sd.DepName,sjp.JobName,su.* From Sys_Users su