考核结果汇总-查看详情Bug修改

performance/Performance.Services/AssessNewService.cs

@@ -886,19 +886,25 @@ public PagedList<AssessSchemeResultListResponse> SchemeResultList(QuerySchemeRes
                 viewAResultQuery = viewAResultQuery.Where(w => w.TargetAccountingUnit == query.TargetAccountingUnit);
             if (!string.IsNullOrEmpty(query.ItemName2))
                 viewAResultQuery = viewAResultQuery.Where(w => w.ItemName2 == query.ItemName2);
-            var result = viewAResultQuery.ToList();
-            var data = result.Select(item =>
+
+            if (viewAResultQuery == null || viewAResultQuery.Count() < 0)
+                throw new PerformanceException("暂无数据");
+
+            var totalItems = viewAResultQuery.Count();
+            var pagedIssueSchemes = viewAResultQuery.Skip((query.Page - 1) * query.PageSize).Take(query.PageSize).ToList();
+
+
+            var data = pagedIssueSchemes.Select(item =>
             {
                 return new AssessSchemeResultListResponse()
                 {
                     TargetUnitType = item.TargetUnitType,
                     TargetAccountingUnit = item.TargetAccountingUnit,
                     ItemName2 = item.ItemName2,
-                    Score =  (item.Score==null?0: item.Score) + item.AssessScore,
+                    Score = (item.Score == null ? 0 : item.Score) + item.AssessScore,
                 };
             }).ToList();
 
-
             var columns = data.Select(item => item.ItemName2).Distinct().ToList();
             var results = data.GroupBy(item => new {  item.TargetUnitType, item.TargetAccountingUnit })
                 .Select(t =>
@@ -911,7 +917,8 @@ public PagedList<AssessSchemeResultListResponse> SchemeResultList(QuerySchemeRes
                     var newResultss = new List<AssessSchemeDictionaryResults>();
                     foreach (var column in columns)
                     {
-                        var score = t.FirstOrDefault(w => w.ItemName2 == column).Score;
+                        var item = t.FirstOrDefault(w => w.ItemName2 == column);
+                        var score = item?.Score ?? 0;
                         dict.Add(column, score);
                         var newResults = new AssessSchemeDictionaryResults()
                         {
@@ -930,9 +937,7 @@ public PagedList<AssessSchemeResultListResponse> SchemeResultList(QuerySchemeRes
                         TotalAssessScore = totalAssessScore
                     };
                 }).ToList();
-            var totalItems = results.Count();
-            var pagedIssueSchemes = results.Skip((query.Page - 1) * query.PageSize).Take(query.PageSize).ToList();
-            return new PagedList<AssessSchemeResultListResponse>(pagedIssueSchemes, query.Page, query.PageSize, totalItems);
+            return new PagedList<AssessSchemeResultListResponse>(results, query.Page, query.PageSize, totalItems);
         }
 
         public PagedList<AssessSchemeEnterDetaiListResponse> SchemeEnterDetailList(QuerySchemeEnterDetailList query)
@@ -951,14 +956,16 @@ public PagedList<AssessSchemeEnterDetaiListResponse> SchemeEnterDetailList(Query
                 issueSchemesQuery = issueSchemesQuery.Where(w => w.ItemName2 == query.ItemName2);
             if ((int)query.State == (int)Assess.AssessState.审核通过)
                 issueSchemesQuery = issueSchemesQuery.Where(w => w.State == (int)query.State);
-            var result = issueSchemesQuery.ToList();
+
             var stateOrders = new int[] { (int)Assess.AssessState.待审核, (int)Assess.AssessState.驳回, (int)Assess.AssessState.审核通过, (int)Assess.AssessState.未提交 };
+            if (!issueSchemesQuery.Any())
+                throw new PerformanceException("暂无数据");
+            issueSchemesQuery = issueSchemesQuery.OrderBy(w => stateOrders.Contains(w.State) ? Array.IndexOf(stateOrders, w.State) : int.MaxValue);
 
-            var datas = mapper.Map<List<AssessSchemeEnterDetaiListResponse>>(result);
-            datas = datas.OrderBy(w => stateOrders.Contains(w.State) ? Array.IndexOf(stateOrders, w.State) : int.MaxValue).ToList();
-            var totalItems = datas.Count();
-            var pagedIssueSchemes = datas.Skip((query.Page - 1) * query.PageSize).Take(query.PageSize).ToList();
-            return new PagedList<AssessSchemeEnterDetaiListResponse>(pagedIssueSchemes, query.Page, query.PageSize, totalItems);
+            var totalItems = issueSchemesQuery.Count();
+            var pagedIssueSchemes = issueSchemesQuery.Skip((query.Page - 1) * query.PageSize).Take(query.PageSize).ToList();
+            var datas = mapper.Map<List<AssessSchemeEnterDetaiListResponse>>(pagedIssueSchemes);
+            return new PagedList<AssessSchemeEnterDetaiListResponse>(datas, query.Page, query.PageSize, totalItems);
         }
         public ApiResponse SchemeEnterAudit(EditSchemeEnterAudit audit, string realName)
         {