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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -52,6 +52,7 @@ using MathNet.Numerics.Distributions;
 using System.Diagnostics.Metrics;
 using EyeSoft.Collections.Generic;
 using Microsoft.Extensions.Hosting;
+using System.Runtime.Intrinsics.Arm;
 
 namespace OASystem.API.Controllers
 {
@@ -355,6 +356,43 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(true));
         }
+
+        /// <summary>
+        /// 日付申请 
+        /// 总经理未审核 日付信息
+        /// </summary>
+        /// <param name="dto"> dto </param>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DailyPaymentGMUnAudited()
+        {
+            var dailyInfos = await _sqlSugar.Queryable<Fin_DailyFeePayment>()
+                                             .LeftJoin<Sys_Users>((dfp, u) => dfp.CreateUserId == u.Id)
+                                             //.Where(dfp => dfp.IsDel == 0 && dfp.IsPay == 0 && dfp.FAudit == 1 && dfp.MAudit != 1)
+                                             .Where(dfp => dfp.IsDel == 0 && 
+                                                           //dfp.IsPay == 0 && 
+                                                           dfp.MAudit == 0
+                                                   )
+                                             .OrderBy(dfp => dfp.CreateTime, OrderByType.Desc)
+                                             //.OrderBy(dfp => dfp.FAudit, OrderByType.Desc)
+                                             .Select((dfp, u) => new
+                                             {
+                                                 id = dfp.Id,
+                                                 amountName = dfp.Instructions,
+                                                 amount = dfp.SumPrice,
+                                                 fAuditStatus = dfp.FAudit == 1 ? "审核通过" : 
+                                                                dfp.FAudit == 2 ? "审核未通过" : "未审核",
+                                                 fAuditDate = dfp.FAuditDate,
+                                                 applicant = u.CnName,
+                                                 applicantDate = dfp.CreateTime
+                                             })
+                                             //.ToListAsync();
+                                             .CountAsync();
+            //int count = dailyInfos.Count;
+            return Ok(JsonView(true,"查询成功", dailyInfos));
+        }
+
         #endregion
 
         #region 团组提成

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1147,6 +1147,23 @@ namespace OASystem.API.Controllers
         {
             try
             {
+                if (dto.CurrUserId < 1) return Ok(JsonView(false, "暂无修改权限！"));
+
+                //修改权限验证 指定人员 信息部门(4)和人事部刘一茹( 230)、赖红燕(309)
+                List<int> userIds = new List<int>() {
+                        4   ,//管理员
+                        5   ,//杨俊霄
+                        117 ,//人事审核号
+                        208 ,//雷怡
+                        230 ,//刘一茹
+                        233 ,//刘华举
+                        234 ,//蒋金辰
+                        235 ,//袁榕烽
+                        309 ,//赖红燕
+                     };
+
+                if (!userIds.Contains(dto.CurrUserId)) return Ok(JsonView(false, "暂无修改权限！"));
+
                 bool res = await _userRep.UpdateAsync<Sys_Users>(a => a.Id == dto.Id, a => new Sys_Users
                 {
                     Number = dto.Number,

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

@@ -31,6 +31,11 @@ namespace OASystem.Domain.Dtos.System
     /// </summary>
     public class EditUserDto
     {
+        /// <summary>
+        /// 当前用户ID
+        /// </summary>
+        public int CurrUserId { get; set; }
+
         /// <summary>
         /// 用户Id
         /// </summary>