考核管理 模板修改 分值字段修改

performance/Performance.Api/Controllers/AssessNewController.cs

@@ -179,8 +179,6 @@ public IActionResult SchemeDownload([FromBody] AddAssessSchemeRequest query)
                 new ExcelDownloadHeads { Alias = "考核方案名称", Name = nameof(RecordAssessScheme.SchemeName) },
                 new ExcelDownloadHeads { Alias = "考核方案类型", Name = nameof(RecordAssessScheme.AssessName) },
                 new ExcelDownloadHeads { Alias = "备注", Name = nameof(RecordAssessScheme.SchemeRemarks) },
-                new ExcelDownloadHeads { Alias = "创建时间", Name = nameof(RecordAssessScheme.CreateTime) },
-                new ExcelDownloadHeads { Alias = "最后修改时间", Name = nameof(RecordAssessScheme.UpdateTime) },
             };
             var q = new QuerySchemeList
             {
@@ -294,8 +292,6 @@ public IActionResult SchemeItemsDownload([FromBody] QuerySchemeItemsList query)
                 new ExcelDownloadHeads { Alias = "考核标准", Name = nameof(per_assess_scheme_items.AssessNorm) },
                 new ExcelDownloadHeads { Alias = "考核单元组别", Name = nameof(per_assess_scheme_items.UnitType) },
                 new ExcelDownloadHeads { Alias = "考核单元名称", Name = nameof(per_assess_scheme_items.AccountingUnit) },
-                new ExcelDownloadHeads { Alias = "创建时间", Name = nameof(per_assess_scheme_items.CreateTime) },
-                new ExcelDownloadHeads { Alias = "最后修改时间", Name = nameof(per_assess_scheme_items.UpdateTime) },
             };
             query.Page = 1;
             query.PageSize = int.MaxValue;

performance/Performance.DtoModels/Request/AssessSchemeEnterRequest.cs

@@ -65,7 +65,7 @@ public class EditAssessSchemeEnterRequest
         /// <summary>
         /// 考核扣分
         /// </summary>
-        public int? Score { get; set; }
+        public decimal? Score { get; set; }
         /// <summary>
         /// 扣分原因
         /// </summary>

performance/Performance.DtoModels/Request/AssessSchemeItemsRequest.cs

@@ -20,7 +20,7 @@ public class AddAssessSchemeItemsRequest
         /// <summary>
         /// 考核分值
         /// </summary>
-        public int AssessScore { get; set; }
+        public decimal AssessScore { get; set; }
         /// <summary>
         /// 考核标准
         /// </summary>

performance/Performance.DtoModels/Response/AssessSchemeDataResponse.cs

@@ -115,7 +115,7 @@ public class AssessSchemeResultListResponse
         public string? ItemName2 { get; set; }
 
         public List<AssessSchemeDictionaryResults> DictionaryResults { get; set; }
-        public int? Score { get; set; }
+        public decimal? Score { get; set; }
         /// <summary>
         /// 合计
         /// </summary>
@@ -123,7 +123,7 @@ public class AssessSchemeResultListResponse
     }
     public class AssessSchemeDictionaryResults
     {
-        public int? Value { get; set; }
+        public decimal? Value { get; set; }
         public string Title { get; set; }
 
     }
@@ -240,7 +240,7 @@ public class AssessSchemeEnterDetaiListResponse
         /// <summary>
         /// 考核扣分
         /// </summary>
-        public int? Score { get; set; }
+        public decimal? Score { get; set; }
         /// <summary>
         /// 扣分原因
         /// </summary>
@@ -305,7 +305,7 @@ public class AssessSchemeItemsUploadResponse
         /// <summary>
         /// 考核分值
         /// </summary>
-        public int AssessScore { get; set; }
+        public decimal AssessScore { get; set; }
         /// <summary>
         /// 考核标准
         /// </summary>

performance/Performance.DtoModels/Response/PerAssessmentStatisticsResponse.cs

@@ -116,7 +116,7 @@ public PerAssessmentStatisticsResponse(per_assess_issue_scheme item)
         /// <summary>
         /// 考核分值
         /// </summary>
-        public int AssessScore { get; set; }
+        public decimal AssessScore { get; set; }
         /// <summary>
         /// 考核标准
         /// </summary>

performance/Performance.EntityModels/Entity/per_assess_issue_scheme.cs

@@ -68,7 +68,7 @@ public class per_assess_issue_scheme
         /// <summary>
         /// 考核分值
         /// </summary>
-        public int AssessScore { get; set; }
+        public decimal AssessScore { get; set; }
         /// <summary>
         /// 考核标准
         /// </summary>
@@ -108,7 +108,7 @@ public class per_assess_issue_scheme
         /// <summary>
         /// 考核扣分
         /// </summary>
-        public int? Score { get; set; }
+        public decimal? Score { get; set; }
         /// <summary>
         /// 扣分原因
         /// </summary>

performance/Performance.EntityModels/Entity/per_assess_scheme_items.cs

@@ -48,7 +48,7 @@ public class per_assess_scheme_items
         /// <summary>
         /// 考核分值
         /// </summary>
-        public int AssessScore { get; set; }
+        public decimal AssessScore { get; set; }
         /// <summary>
         /// 考核标准
         /// </summary>

performance/Performance.EntityModels/Other/view_assess_issue.cs

@@ -52,7 +52,7 @@ public class view_assess_issue
         /// <summary>
         /// 考核分值
         /// </summary>
-        public int AssessScore { get; set; }
+        public decimal AssessScore { get; set; }
         /// <summary>
         /// 考核标准
         /// </summary>

performance/Performance.EntityModels/Other/view_assess_result.cs

@@ -32,7 +32,7 @@ public class view_assess_result
         /// <summary>
         /// 分值
         /// </summary>
-        public int Score { get; set; }
+        public decimal? Score { get; set; }
         /// <summary>
         /// 责任部门核算单元编码
         /// </summary>

performance/Performance.Services/AssessNewService.cs

@@ -376,7 +376,10 @@ public ApiResponse SchemeDelete(BatchAssessSchemeRequest request)
         {
             var temp = perforPerAssessSchemeItemsRepository.GetEntity(w => request.SchemeId.Contains(w.SchemeId));
             if (temp != null || temp?.Id > 0)
-                throw new PerformanceException("请先删除方案下的指标");
+                throw new PerformanceException("请先删除方案下的考核内容");
+            var temp1 = perforPerAssessSchemeTargetRepository.GetEntity(w => request.SchemeId.Contains(w.SchemeId));
+            if (temp1 != null || temp1?.Id > 0)
+                throw new PerformanceException("请先删除方案下的核算单元");
             var issuedates = perforPerAssessSchemeRepository.GetEntities(w => request.SchemeId.Contains(w.Id)).ToList();
             if (perforPerAssessSchemeRepository.RemoveRange(issuedates.ToArray())) return new ApiResponse(ResponseType.OK, "删除成功");
             else return new ApiResponse(ResponseType.Fail, "删除失败");
@@ -534,14 +537,19 @@ public PagedList<AssessSchemeTargetResponse> SchemeItemsTargetList(QuerySchemeIt
         {
             //查询全部的方案
             var schemes = perforPerAssessSchemeRepository.GetEntities(w => w.AllotId == query.AllotId);
+            if (schemes == null || !schemes.Any())
+                throw new PerformanceException("未找到方案");
             //查询方案的考核对象
             var schemeTargets = perforPerAssessSchemeTargetRepository.GetEntities(w => w.AssessId == query.AssessId && w.AllotId == query.AllotId);
+
             //查询当前方案的考核对象
             var currentTargers = schemeTargets.Where(w => w.SchemeId == query.SchemeId).ToList();
             ////查询其他方案的考核对象
             var otherTargers = schemeTargets.Where(w => w.SchemeId != query.SchemeId).ToList();
             //查询全部的核算单元
             var cofaccounting = cofaccountingRepository.GetEntities(w => w.AllotId == query.AllotId);
+            if (cofaccounting.Count() == 0 || !cofaccounting.Any())
+                throw new PerformanceException("暂无核算单元数据");
             var stateOrders = new int[] { (int)Assess.SchemeItemsTarget.未设置方案, (int)Assess.SchemeItemsTarget.已设置其他方案, (int)Assess.SchemeItemsTarget.已设置方案 };
             var result = new List<AssessSchemeTargetResponse>();
             foreach (var cof in cofaccounting)