考核结果汇总（分值计算改为视图来计算）

performance/Performance.EntityModels/Other/view_assess_result.cs

@@ -9,7 +9,6 @@ public class view_assess_result
         /// 绩效ID
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-
         /// <summary>
         /// 考核类型ID
         /// </summary>
@@ -22,6 +21,7 @@ public class view_assess_result
         /// 指标Id
         /// </summary>
         public int ItemId { get; set; }
+        /// <summary>
         /// 二级指标名称
         /// </summary>
         public string ItemName2 { get; set; }
@@ -34,7 +34,7 @@ public class view_assess_result
         /// </summary>
         public decimal? AssessScore { get; set; }
         /// <summary>
-        /// 扣分值
+        /// 最后得分
         /// </summary>
         public decimal? Score { get; set; }
         /// <summary>

performance/Performance.Services/AssessNewService.cs

@@ -910,7 +910,7 @@ public PagedList<AssessSchemeResultListResponse> SchemeResultList(QuerySchemeRes
                     TargetUnitType = item.TargetUnitType,
                     TargetAccountingUnit = item.TargetAccountingUnit,
                     ItemName2 = item.ItemName2,
-                    Score = (item.Score == null ? 0 : item.Score) + item.AssessScore,
+                    Score = item.Score,
                 };
             }).ToList();
 
@@ -1088,8 +1088,8 @@ public ApiResponse SchemeEnterUpload(int itemId, IFormCollection form, int useri
                 error.AddIf(string.IsNullOrEmpty(eTargetUnitType), item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "核算单元空值无效，请检查后重试！");
                 error.AddIf(!decimal.TryParse(eBonusPoint, out decimal ebonusPoint), item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "考核加分值无效，请检查后重试！");
                 error.AddIf(!decimal.TryParse(eDeduction, out decimal ededuction), item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "考核扣分值无效，请检查后重试！");
-                error.AddIf(ebonusPoint<0, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "考核加分值无效，请检查后重试！");
-                error.AddIf(ededuction>0, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "考核扣分值无效，请检查后重试！");
+                error.AddIf(ebonusPoint < 0, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "考核加分值无效，请检查后重试！");
+                error.AddIf(ededuction > 0, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "考核扣分值无效，请检查后重试！");
 
                 var issueData = issueDatas.FirstOrDefault(w => w.ItemId == itemId && w.TargetAccountingUnit == eTargetAccountingUnit && w.TargetUnitType == eTargetUnitType);
                 error.AddIf(issueData == null, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eBonusPoint, eBonusPointRemark, eDeduction, eDeductionRemark, "未找到部门，请检查后重试！");

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -569,7 +569,7 @@ private string ValueFormating(decimal? value, string format)
                 }
                 else if (format == UniteDept.Format.四位小数.ToString())
                 {
-                    total = Math.Round(total, 3, MidpointRounding.AwayFromZero);
+                    total = Math.Round(total, 4, MidpointRounding.AwayFromZero);
                     return string.Format("{0:0.####}", total);
                 }
                 return string.Format("{0:0.####}", total);