Browse Source

修改为区间

yuanrf 7 hours ago
parent
commit
08b1471ac0

File diff suppressed because it is too large
+ 39 - 17
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs


+ 10 - 0
OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -1346,6 +1346,16 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         int size = 100,
         List<IQiYeWeChatApiService.FilterCondition> filters = null)
         {
+            //申请人企业微信Id验证
+            var creator = filters?.FirstOrDefault(f => f.key == "creator")?.value ?? "";
+            if (string.IsNullOrEmpty(creator))
+            {
+                return new ApprovalInfoView
+                {
+                    errcode = -1,
+                    errmsg = "OA用户信息中未填写申请人企业微信ID!"
+                };
+            }
 
             long starttime = (long)(startTime - _1970).TotalSeconds;
             long endtime = (long)(endTime - _1970).TotalSeconds;

+ 6 - 2
OASystem/OASystem.Domain/Dtos/PersonnelModule/AiPerformanceAnalysisDtos.cs

@@ -17,9 +17,13 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public string ScreeningCriteria { get; set; }
 
-        public int Year { get; set; }
+        //年月改时间区间    
+        //public int Year { get; set; }
 
-        public int Month { get; set; }
+        //public int Month { get; set; }
+
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
 
         public int UserId { get; set; }
     }

+ 10 - 0
OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_PerformanceAnalysis.cs

@@ -5,6 +5,16 @@ namespace OASystem.Domain.Entities.PersonnelModule
         public int UserId { get; set; }
         public int Year { get; set; }
         public int Month { get; set; }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public DateTime StartDate { get; set; }
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public DateTime EndDate { get; set; }
+
         public string JsonResult { get; set; }
     }
 }