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

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2157,6 +2157,11 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return parent;
         }
 
+        /// <summary>
+        /// 绩效项增改
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         public async Task<IActionResult> AssessmentSettingOperationAsync(PerAssessmentSettingOperationDto dto)
         {
@@ -2214,6 +2219,11 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return Ok(jw);
         }
 
+        /// <summary>
+        /// 绩效内容增改
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         public IActionResult AssessmentSettingOperationContentAsync(AssessmentSettingOperationContenDto dto)
         {
@@ -2264,6 +2274,11 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return Ok(jw);
         }
 
+        /// <summary>
+        /// 绩效项查询
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         [HttpPost]
         public async Task<IActionResult> QueryAssessmentSettingListOffsetAsync(QueryAssessmentSettingListOffsetAsyncDto dto)
         {
@@ -2299,6 +2314,53 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return Ok(jw);
         }
 
+        /// <summary>
+        /// 绩效分数保存
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult SaveUserAssessmen(SaveUserAssessmenDto dto)
+        {
+            var jw = JsonView(false,"请传入正确的数据！");
+            if (dto.Data.Any()) {
+
+                var ids = dto.Data.Select(x => x.AssessmentContentSettingId).ToList();
+                var QueryContent_DB = _sqlSugar.Queryable<Per_AssessmentContentSetting>()
+                                               .InnerJoin<Per_AssessmentSetting>((a, b) => b.IsDel == 0 && a.AssessmentSettingId == b.Id)
+                                               .Where((a, b) => a.IsDel == 0 && ids.Contains(a.Id))
+                                               .Select((a, b) => new
+                                               {
+                                                   ContentSettingId = a.Id,
+                                                   SettingId = b.Id,
+                                                   a.TargetValue,
+                                                   b.AssessmentStandard,
+                                                   MergeStr =  $"【项名称:{b.Name}/目标值:{a.TargetValue}/评估标准:{b.AssessmentStandard}】"
+                                               })
+                                               .ToList()
+                                               .ToDictionary(x=> x.ContentSettingId);
+
+                //删除上级未确认数据
+                //添加新数据
+
+                var entityList =  dto.Data.Select(x => new Per_AssessmentScore
+                {
+                    Id = x.ScoreId,
+                    AssessmentContentSettingId = x.AssessmentContentSettingId,
+                    CreateTime = DateTime.Now,
+                    CreateUserId = dto.CreateUserId,
+                    Details = QueryContent_DB[x.AssessmentContentSettingId].MergeStr,
+                    HigherUpAssessment = x.HigherUpAssessment,
+                    HigherUpUserId = x.LeadersId,
+                    HigherUpConfig = 0,
+                    SelfAssessment = x.SelfAssessment,
+                    IsDel = 0,
+                })
+                .ToList();
+            }
+            return Ok(jw);
+        }
+
         #endregion
 
         #region 企微Api测试

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

@@ -71,7 +71,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// <summary>
         /// 达成情况
         /// </summary>
-        public int Status { get; set; }
+        public string Status { get; set; }
 
         /// <summary>
         /// 自评
@@ -179,4 +179,23 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         public string Start { get; set; }
         public string End { get; set; }
     }
+
+    public class SaveUserAssessmenDto
+    {
+        public int CreateUserId { get; set; }
+        public List<itemScore> Data { get; set; }
+    }
+
+    public class itemScore
+    {
+        public int ScoreId { get; set; }
+        public int AssessmentContentSettingId {  get; set; }
+
+        public decimal SelfAssessment { get; set; }
+
+        public decimal HigherUpAssessment { get; set; }
+
+        public int LeadersId { get; set; }
+
+    }
 }

OASystem/OASystem.Domain/Entities/PersonnelModule/Per_PerformanceSetting.cs

@@ -86,7 +86,7 @@ namespace OASystem.Domain.Entities.PersonnelModule
         /// <summary>
         /// 达成情况
         /// </summary>
-        public int Status { get; set; }
+        public string Status { get; set; }
 
         /// <summary>
         /// 自评