考勤管理 考核结果汇总添加状态字段

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -2110,6 +2110,11 @@
             考核目标核算单元
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Request.QuerySchemeEnterDetailList.State">
+            <summary>
+            操作类型   未提交 = 1,待审核 = 2,审核通过 = 3,驳回 = 4,
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Request.QuerySchemeEnterDetailList.ItemName2">
             <summary>
             二级指标名称

performance/Performance.Services/AssessNewService.cs

@@ -707,7 +707,7 @@ public ApiResponse SchemeItemsUpload(int schemeId, int allotId, IFormCollection
                         ItemName2 = eItemName2,
                         AssessScore = eAScore,
                         AssessNorm = eAssessNorm,
-                        UnitCode = cofaccountingdatas.FirstOrDefault(w => w.AccountingUnit == eAccountingUnit && w.UnitType == eUnitType).Code,
+                        UnitCode = cofaccountingdata.Code,
                         UnitType = eUnitType,
                         AccountingUnit = eAccountingUnit,
                         OperationType = (int)Attendance.OperationType.新增
@@ -722,7 +722,7 @@ public ApiResponse SchemeItemsUpload(int schemeId, int allotId, IFormCollection
                         ItemName2 = eItemName2,
                         AssessScore = eAScore,
                         AssessNorm = eAssessNorm,
-                        UnitCode = cofaccountingdatas.FirstOrDefault(w => w.AccountingUnit == eAccountingUnit && w.UnitType == eUnitType).Code,
+                        UnitCode = cofaccountingdata.Code,
                         UnitType = eUnitType,
                         AccountingUnit = eAccountingUnit,
                         OperationType = (int)Attendance.OperationType.修改
@@ -1036,13 +1036,13 @@ 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}行" }))
             {
                 if (string.IsNullOrEmpty(string.Join("", item.value.Values))) continue;
-                var eTargetAccountingUnit = item.value.GetOrAdd("核算单元", "")?.ToString() ?? "";
                 var eTargetUnitType = item.value.GetOrAdd("核算组别", "")?.ToString() ?? "";
+                var eTargetAccountingUnit = item.value.GetOrAdd("核算单元名称", "")?.ToString() ?? "";
                 var eItemName1 = item.value.GetOrAdd("一级指标名称", "")?.ToString() ?? "";
                 var eItemName2 = item.value.GetOrAdd("考核项目", "")?.ToString() ?? "";
                 var eAssessScore = item.value.GetOrAdd("考核分值", "")?.ToString() ?? "";