核算单元上报考核指标项上传（下载列名错误修改）

performance/Performance.Api/Controllers/AssessNewController.cs

@@ -557,8 +557,8 @@ public IActionResult SchemeEnterDownload([FromBody] QuerySchemeEnterDetailList q
                 new ExcelDownloadHeads { Alias = "考核项目", Name = nameof(AssessSchemeEnterDetaiListResponse.ItemName2) },
                 new ExcelDownloadHeads { Alias = "考核标准", Name = nameof(AssessSchemeEnterDetaiListResponse.AssessNorm) },
                 new ExcelDownloadHeads { Alias = "考核分值", Name = nameof(AssessSchemeEnterDetaiListResponse.AssessScore) },
-                new ExcelDownloadHeads { Alias = "考核扣/减分", Name = nameof(AssessSchemeEnterDetaiListResponse.Score) },
-                new ExcelDownloadHeads { Alias = "扣/减分原因", Name = nameof(AssessSchemeEnterDetaiListResponse.ScoreRemark) },
+                new ExcelDownloadHeads { Alias = "考核加/减分", Name = nameof(AssessSchemeEnterDetaiListResponse.Score) },
+                new ExcelDownloadHeads { Alias = "加/减分原因", Name = nameof(AssessSchemeEnterDetaiListResponse.ScoreRemark) },
             };
             query.Page = 1;
             query.PageSize = int.MaxValue;

performance/Performance.Services/AssessNewService.cs

@@ -1059,7 +1059,7 @@ public ApiResponse SchemeEnterUpload(int itemId, IFormCollection form, int useri
             var datas = ToListDictionary(dt);
             if (datas.Count == 0 || !datas.Any())
                 throw new PerformanceException("未在文件中找到数据");
-            Tables error = new Tables("行", "核算组别", "核算单元名称", "一级指标名称", "考核项目", "考核分值", "考核扣分", "扣分原因", "原因");
+            Tables error = new Tables("行", "核算组别", "核算单元名称", "一级指标名称", "考核项目", "考核分值", "考核加/减分", "加/减分原因", "原因");
             var issues = new List<per_assess_issue_scheme>();
             foreach (var item in datas.Select((value, i) => new { value, index = $"第{i + 1}行" }))
             {
@@ -1069,15 +1069,15 @@ public ApiResponse SchemeEnterUpload(int itemId, IFormCollection form, int useri
                 var eItemName1 = item.value.GetOrAdd("一级指标名称", "")?.ToString() ?? "";
                 var eItemName2 = item.value.GetOrAdd("考核项目", "")?.ToString() ?? "";
                 var eAssessScore = item.value.GetOrAdd("考核分值", "")?.ToString() ?? "";
-                var eScore = item.value.GetOrAdd("考核扣分", "")?.ToString() ?? "";
-                var eScoreRemark = item.value.GetOrAdd("扣分原因", "")?.ToString() ?? "";
+                var eScore = item.value.GetOrAdd("考核加/减分", "")?.ToString() ?? "";
+                var eScoreRemark = item.value.GetOrAdd("加/减分原因", "")?.ToString() ?? "";
                 eScore = String.IsNullOrEmpty(eScore) ? "0" : eScore;
                 eAssessScore = String.IsNullOrEmpty(eAssessScore) ? "0" : eAssessScore;
                 decimal.TryParse(eAssessScore, out decimal eAScore);
                 error.AddIf(string.IsNullOrEmpty(eTargetAccountingUnit), item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eScore, eScoreRemark, "核算单元空值无效，请检查后重试！");
                 error.AddIf(string.IsNullOrEmpty(eTargetUnitType), item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eScore, eScoreRemark, "核算单元空值无效，请检查后重试！");
                 error.AddIf(!decimal.TryParse(eScore, out decimal escore), item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eScore, eScoreRemark, "考核扣分值无效，请检查后重试！");
-                error.AddIf(escore > eAScore, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eScore, eScoreRemark, "考核扣分大于考核分值，请检查后重试！");
+                error.AddIf(escore > eAScore, item.index, eTargetAccountingUnit, eTargetUnitType, eItemName1, eItemName2, eAssessScore, eScore, eScoreRemark, "考核加/减分大于考核分值，请检查后重试！");
 
                 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, eScore, eScoreRemark, "未找到部门，请检查后重试！");