计算工资

假期审批数据
审批范围查询 向后增加十五天

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -653,7 +653,36 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> WageSheetTaxTemplate()
         {
             string serverUrl = AppSettingsHelper.Get("WageSheetExcelBaseUrl");
-            return Ok(JsonView(true, "操作成功!",new { FileUrl = serverUrl + "Office/WageSheetFile/个税导入模板.xlsx" }));
+            var userData = await _usersRep.GetUserNameList(1);
+
+            if (userData.Code == 0)
+            {
+                var userNames = userData.Data;
+
+                List<string> names = new List<string>();
+
+                List<UserNameView> users = new List<UserNameView>();
+                users = JsonConvert.DeserializeObject<List<UserNameView>>(JsonConvert.SerializeObject(userNames));
+
+                foreach (UserNameView item in users)
+                {
+                    names.Add(item.CnName);
+                }
+
+                names.Remove("管理员");
+                names.Remove("国交共享号");
+                names.Remove("人事审核号");
+                names.Remove("国交主管号");
+
+                if (names.Count > 0)
+                {
+                    return Ok(JsonView(true, "操作成功!", new { FileUrl = serverUrl + "Office/WageSheetFile/个税导入模板.xlsx" }));
+                }
+
+            }
+
+
+            return Ok(JsonView(false, "操作失败!"));
         }
 
         /// <summary>

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -1009,21 +1009,11 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
 
             ApprovalInfoView approvalInfoView = new ApprovalInfoView();
 
-            //获取所有打卡补卡，审批 数据 前后范围增加10天
-            DateTime sp_startDt = startDt.AddDays(-10);
-            DateTime sp_centerDt = sp_startDt.AddDays(31);
-            DateTime sp_endDt = endDt.AddDays(10);
-            DateTime thisDt = Convert.ToDateTime( DateTime.Now.ToString("yyyy-MM-dd"));
-            if (sp_endDt > thisDt)
-            {
-                sp_endDt = thisDt;
-            }
-            int days = (int)(sp_endDt - sp_startDt).TotalDays;
-            if (days > 31)
-            {
-                sp_centerDt = sp_startDt.AddDays(31);
-            }
-
+            //获取所有打卡补卡，审批 数据 后范围增加15天
+            DateTime sp_startDt = startDt;
+            DateTime sp_centerDt = endDt;
+            DateTime sp_endDt = endDt.AddDays(15);
+            
             //获取审批数据 token
             Access_TokenView access_Token = await GetTokenAsync(5);
             if (access_Token.errcode != 0)