计算工资 5.16

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -279,7 +279,7 @@ namespace OASystem.API.Controllers
 
             //计算本月工资起止时间 比如是2月的1号-28号，那就是2月1号的零点到3月1号的零点 
             DateTime thisStartDt = startDt;
-            DateTime thisEndDt = endDt.AddDays(1); //
+            DateTime thisEndDt = endDt; //
 
             //本月工资是否有数据 有数据则不计算
             result = await _wageSheetRep.Get_WageSheet_ListByYearMonthAsync(thisYearMonth);
@@ -290,6 +290,7 @@ namespace OASystem.API.Controllers
 
             //获取上个月工资信息
             List<Pm_WageSheet> preWageSheetItems = await _wageSheetRep._sqlSugar.Queryable<Pm_WageSheet>().Where(it => it.IsDel == 0 && it.YearMonth == preYearMonth).ToListAsync();
+            preWageSheetItems = preWageSheetItems.OrderBy(it => it.UserId).ToList();
             if (preWageSheetItems.Count <= 0) 
             {
                 return Ok(JsonView(false, thisYearMonth + " 上月工资数据不存在,请手动添加!"));

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/IQiYeWeChatApiService.cs

@@ -27,6 +27,12 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         /// <returns></returns>
         Task<ResponseBase> CreateAsync(Create_Request create_Request);
 
+        /// <summary>
+        /// 获取成员ID列表
+        /// </summary>
+        /// <returns></returns>
+        Task<UserIdListView> GetUserIdListAsync();
+
         /// <summary>
         /// 获取月打卡数据
         /// </summary>

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

@@ -137,7 +137,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         /// 获取成员ID列表
         /// </summary>
         /// <returns></returns>
-        private async Task<UserIdListView> GetUserIdListAsync()
+        public async Task<UserIdListView> GetUserIdListAsync()
         {
             UserIdListView userIdListView = new UserIdListView();
             Access_TokenView access_Token = await GetTokenAsync(4);
@@ -163,9 +163,6 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
             userIdListView = System.Text.Json.JsonSerializer.Deserialize<UserIdListView>(stringResponse,
                 new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
 
-
-
-
             return userIdListView;
         }
 
@@ -542,10 +539,10 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
                 return checkInDayDataView;
             }
 
-            string url = string.Format("/cgi-bin/checkin/getcheckin_daydata?access_token={0}", access_Token.access_token);
+            string url = string.Format("/cgi-bin/checkin/getcheckin_daydata?access_token={0}&debug=1", access_Token.access_token);
 
-            long startTs = (long)(startDt - _1970).TotalSeconds;
-            long endTs = (long)(endDt - _1970).TotalSeconds;
+            long startTs = (startDt.ToUniversalTime().Ticks - 621355968000000000) / 10000000;
+            long endTs = (endDt.ToUniversalTime().Ticks - 621355968000000000) / 10000000;
 
             var checkInData_Req = new 
             {

OASystem/OASystem.Domain/ViewModels/QiYeWeChat/CheckInDayDataView.cs

@@ -41,7 +41,7 @@ namespace OASystem.Domain.ViewModels.QiYeWeChat
         /// <summary>
         /// 
         /// </summary>
-        public List<Sp_itemsItem>? sp_items { get; set; }
+        public List<Sp_items>? sp_items { get; set; }
     }
 
     public class Exception_infos
@@ -209,7 +209,7 @@ namespace OASystem.Domain.ViewModels.QiYeWeChat
         public List<long>? exception_duration { get; set; }
     }
 
-    public class Sp_itemsItem
+    public class Sp_items
     {
         /// <summary>
         ///