考核指标项上传添加限制

performance/Performance.Services/AssessNewService.cs

@@ -512,6 +512,10 @@ public ApiResponse<UpdateAssessSchemeItemsRequest> SchemeItemsUpdate(UpdateAsses
             var cofAccounting = cofaccountingRepository.GetEntity(w => w.AllotId == request.AllotId && w.AccountingUnit == request.AccountingUnit && w.UnitType == request.UnitType);
             if (cofAccounting == null)
                 throw new PerformanceException("当前的核算组别或者核算单元错误");
+            var categoryData = perforPerAssessSchemeItemsRepository.GetEntities();
+            var temp = categoryData.FirstOrDefault(w => w.SchemeId == request.SchemeId && w.ItemName2 == request.ItemName2);
+            if (temp != null)
+                throw new PerformanceException("当前指标已存在");
             var any = perforPerAssessSchemeItemsRepository.GetEntity(w => w.AllotId == request.AllotId && w.Id == request.SchemeItemsId);
             any.ItemName1 = request.ItemName1;
             any.ItemName2 = request.ItemName2;
@@ -695,15 +699,17 @@ public ApiResponse SchemeItemsUpload(int schemeId, int allotId, IFormCollection
                 var eUnitType = item.value.GetOrAdd("考核单元组别", "")?.ToString() ?? "";
                 var eAccountingUnit = item.value.GetOrAdd("考核单元名称", "")?.ToString() ?? "";
                 eAssessScore = String.IsNullOrEmpty(eAssessScore) ? "0" : eAssessScore;
-                error.AddIf(string.IsNullOrEmpty(eItemName1), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "一级指标名称空值无效，请检查后重试！");
-                error.AddIf(string.IsNullOrEmpty(eItemName2), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "二级指标名称空值无效，请检查后重试！");
-                error.AddIf(!decimal.TryParse(eAssessScore, out decimal eAScore), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "考核分值填写无效，请检查后重试！");
-                error.AddIf(eAScore == 0, item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "考核分值不能为0，请检查后重试！");
-                error.AddIf(string.IsNullOrEmpty(eAssessNorm), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "考核标准空值无效，请检查后重试！");
-                error.AddIf(string.IsNullOrEmpty(eUnitType), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "考核单元组别空值无效，请检查后重试！");
-                error.AddIf(string.IsNullOrEmpty(eAccountingUnit), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "考核单元名称空值无效，请检查后重试！");
+                error.AddIf(string.IsNullOrEmpty(eItemName1), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "一级指标名称空值无效，请检查后重试！");
+                error.AddIf(string.IsNullOrEmpty(eItemName2), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "二级指标名称空值无效，请检查后重试！");
+                error.AddIf(!decimal.TryParse(eAssessScore, out decimal eAScore), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "考核分值填写无效，请检查后重试！");
+                error.AddIf(eAScore == 0, item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "考核分值不能为0，请检查后重试！");
+                error.AddIf(string.IsNullOrEmpty(eAssessNorm), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "考核标准空值无效，请检查后重试！");
+                error.AddIf(string.IsNullOrEmpty(eUnitType), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "考核单元组别空值无效，请检查后重试！");
+                error.AddIf(string.IsNullOrEmpty(eAccountingUnit), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "考核单元名称空值无效，请检查后重试！");
                 var cofaccountingdata = cofaccountingdatas.FirstOrDefault(w => w.AccountingUnit == eAccountingUnit && w.UnitType == eUnitType);
-                error.AddIf(cofaccountingdata == null, item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eAccountingUnit, "未找到相关考核单元组别或者考核单元名称，请检查后重试！");
+                error.AddIf(cofaccountingdata == null, item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "未找到相关考核单元组别或者考核单元名称，请检查后重试！");
+                var itemsDataeItemName2 = itemsDatas.FirstOrDefault(w => w.ItemCode != eItemCode && w.ItemName2 == eItemName2);
+                error.AddIf(itemsDataeItemName2 != null, item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "二级指标名称出现重复，请检查后重试！");
                 if (cofaccountingdata == null) continue;
                 var itemsData = itemsDatas.FirstOrDefault(w => w.ItemCode == eItemCode);
                 var data = new AssessSchemeItemsUploadResponse();
@@ -736,6 +742,7 @@ public ApiResponse SchemeItemsUpload(int schemeId, int allotId, IFormCollection
                         OperationType = (int)Attendance.OperationType.修改
                     };
                 }
+                error.AddIf(upload.Any(w => w.ItemName2 == eItemName2), item.index, "", eItemName1, eItemName2, eAssessScore, eAssessNorm, eUnitType, eAccountingUnit, "二级指标名称出现重复，请检查后重试！");
                 upload.Add(data);
             }
             if (error.Any())
@@ -903,7 +910,7 @@ public PagedList<AssessSchemeResultListResponse> SchemeResultList(QuerySchemeRes
             }).ToList();
 
             var columns = data.Select(item => item.ItemName2).Distinct().ToList();
-            var results = data.GroupBy(item => new {  item.TargetUnitType, item.TargetAccountingUnit })
+            var results = data.GroupBy(item => new { item.TargetUnitType, item.TargetAccountingUnit })
                 .Select(t =>
                 {
                     var dict = new Dictionary<string, object>