Parcourir la source

计算工资 GetApprovalDataRedisAsync 更改

leiy il y a 1 an
Parent
commit
c9ebae654b

+ 11 - 4
OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -459,10 +459,15 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
             DateTime sp_endDt = endDt.AddDays(10);
 
 
-            string redisName = "ApprovalData_" + sp_startDt.Year + "_" + sp_startDt.Month;
-            string sp_InfosString = await RedisRepository.RedisFactory
-                                            .CreateRedisRepository()
-                                            .StringGetAsync<string>(redisName);//string 取
+            string redisName = "ApprovalData" + sp_startDt.ToString("yyyyMMdd") + "-" + sp_endDt.ToString("yyyyMMdd");
+            string sp_InfosString = string.Empty;
+
+            //sp_InfosString = await RedisRepository.RedisFactory
+            //                            .CreateRedisRepository()
+            //                            .StringGetAsync<string>(redisName);//string 取
+
+
+
             if (string.IsNullOrEmpty(sp_InfosString))
             {
                 ApprovalDataView approvalData_1 = await GetApprovalDataAsync(sp_startDt, sp_centerDt);  //时间段内所有 审批数据
@@ -482,6 +487,8 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
                 }
                 sp_Infos.AddRange(approvalData_2.data);
 
+                sp_Infos = sp_Infos.Where(it => it.sp_status == 2).ToList(); //存储已审核的数据
+
                 TimeSpan ts = DateTime.Now.AddMinutes(60) - DateTime.Now; //设置redis 过期时间 60分钟
                 await RedisRepository
                     .RedisFactory