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

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2162,6 +2162,16 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             var jw = JsonView(false);
             try
             {
+                if (dto.ParentId != 0)
+                {
+                    var parent = await _sqlSugar.Queryable<Per_AssessmentSetting>().FirstAsync(x=>x.IsDel == 0 && x.Id == dto.ParentId);
+                    if (parent == null)
+                    {
+                        jw.Msg = "父级节点不存在";
+                        return Ok(jw);
+                    }
+                }
+
                 var entity = new Per_AssessmentSetting
                 {
                     Name = dto.Name,
@@ -2197,6 +2207,56 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return Ok(jw);
         }
 
+        [HttpPost]
+        public IActionResult AssessmentSettingOperationContentAsync(AssessmentSettingOperationContenDto dto)
+        {
+            var jw = JsonView(false, "", "");
+            var entity = new Per_AssessmentContentSetting
+            {
+                AssessmentProportionChi = dto.AssessmentProportionChi,
+                AssessmentSettingId = dto.AssessmentSettingId,
+                CreateTime = DateTime.Now,
+                CreateUserId = dto.CreateUserId,
+                Fixed = dto.Fixed,
+                Id = dto.Id,
+                JobId = dto.JobId,
+                TargetValue = dto.TargetValue,
+                UserId = dto.UserId,
+                Remark = dto.Remark,
+            };
+            var entity_Fk = _sqlSugar.Queryable<Per_AssessmentSetting>().First(x => x.Id == dto.AssessmentSettingId && x.IsDel == 0);
+
+            if (entity_Fk == null)
+            {
+                jw.Msg = "考核设置不存在";
+                return Ok(jw);
+            }
+
+            try
+            {
+                if (dto.Id == 0)
+                {
+                    //add
+                    var insertCount = _sqlSugar.Insertable(entity).ExecuteCommand();
+                    jw.Msg = "添加成功!";
+                }
+                else
+                {
+                    //update
+                    var updateCount = _sqlSugar.Updateable(entity).ExecuteCommand();
+                    jw.Msg = "修改成功!";
+                }
+
+                jw.Code = 200;
+            }
+            catch (Exception ex)
+            {
+                jw.Msg = "Api error " + ex.Message;
+                jw.Code = 400;
+            }
+            return Ok(jw);
+        }
+
         [HttpPost]
         public async Task<IActionResult> QueryAssessmentSettingListOffsetAsync(QueryAssessmentSettingListOffsetAsyncDto dto)
         {
@@ -2231,5 +2291,16 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
         }
 
         #endregion
+
+        #region 企微Api测试
+        [HttpPost]
+        public async Task<IActionResult> GetCheckin_MonthDataAsync(DateTime start, DateTime end)
+        {
+            var jw = JsonView(false);
+            jw.Data = await _qiYeWeChatApiService.GetCheckin_MonthDataAsync1(start,end);
+            return Ok(jw);
+        }
+
+        #endregion
     }
 }

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1609,7 +1609,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                             else return id;
                         }).ToArray();
 
-                        var _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(x => groupIds.Contains(x.Id)).ToList();
+                        var _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(x => groupIds.Contains(x.Id) && x.IsDel == 0).ToList();
                         foreach (var group in _DelegationInfos)
                         {
                             groupNameStr += $"{group.TeamName},";
@@ -1619,6 +1619,8 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                             groupNameStr = groupNameStr.Substring(0, groupNameStr.Length - 1);
                         }
                     }
+
+                    item.DelegationStr = groupNameStr;
                 }
 
                 return Ok(JsonView(true, $"查询成功!", _ivitiesViews, totalCount));

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

@@ -54,6 +54,14 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         /// <returns></returns>
         Task<CheckInView> GetCheckin_MonthDataAsync(DateTime startDt, DateTime endDt);
 
+
+        /// 获取月打卡数据
+        /// </summary>
+        /// <param name="startDt"></param>
+        /// <param name="endDt"></param>
+        /// <returns></returns>
+        Task<CheckInView> GetCheckin_MonthDataAsync1(DateTime startDt, DateTime endDt);
+
         /// <summary>
         /// 获取月打卡数据 Redis
         /// </summary>

OASystem/OASystem.Domain/Dtos/PersonnelModule/TreeNode.cs

@@ -122,6 +122,45 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         public string Remark { get; set; }
     }
 
+    public class AssessmentSettingOperationContenDto
+    {
+
+        public int Id { get; set; }
+
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 项目设置表id
+        /// </summary>
+        public int AssessmentSettingId { get; set; }
+
+        /// <summary>
+        /// 占比
+        /// </summary>
+        public decimal AssessmentProportionChi { get; set; }
+
+        /// <summary>
+        /// 目标值
+        /// </summary>
+        public string TargetValue { get; set; }
+
+        /// <summary>
+        /// 岗位id
+        /// </summary>
+        public int JobId { get; set; }
+
+        /// <summary>
+        /// 员工id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 固定标识 (1 是固定 2 是灵活)
+        /// </summary>
+        public int Fixed { get; set; }
+
+        public string Remark { get; set; }
+    }
+
     public class QueryAssessmentSettingListOffsetAsyncDto 
     {
         public  int pageIndex { get; set; }