去重

parent 1220c4ad
...@@ -341,7 +341,7 @@ public ApiResponse GetAprDetail([FromBody] AprAmountAuditRequest request) ...@@ -341,7 +341,7 @@ public ApiResponse GetAprDetail([FromBody] AprAmountAuditRequest request)
{ {
Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key, Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
Value = s.Sum(sum => sum.Amount ?? 0), Value = s.Sum(sum => sum.Amount ?? 0),
Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)), Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark).Distinct()),
}) })
}); });
return new ApiResponse(ResponseType.OK, "ok", result); return new ApiResponse(ResponseType.OK, "ok", result);
...@@ -541,7 +541,7 @@ public ApiResponse AprOverview(int allotId) ...@@ -541,7 +541,7 @@ public ApiResponse AprOverview(int allotId)
Detail = t.GroupBy(group => group.PerforType).Select(s => new Detail = t.GroupBy(group => group.PerforType).Select(s => new
{ {
Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key, Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)), Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark).Distinct()),
Value = s.Sum(sum => sum.Amount ?? 0) Value = s.Sum(sum => sum.Amount ?? 0)
}) })
}); });
...@@ -711,7 +711,7 @@ public ApiResponse GetAprHideDetail([FromBody] per_apr_amount request) ...@@ -711,7 +711,7 @@ public ApiResponse GetAprHideDetail([FromBody] per_apr_amount request)
{ {
Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key, Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
Value = s.Sum(sum => sum.Amount ?? 0), Value = s.Sum(sum => sum.Amount ?? 0),
Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)), Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark).Distinct()),
}) })
}); });
return new ApiResponse(ResponseType.OK, "ok", result); return new ApiResponse(ResponseType.OK, "ok", result);
...@@ -901,7 +901,7 @@ public ApiResponse AprHideOverview(int allotId) ...@@ -901,7 +901,7 @@ public ApiResponse AprHideOverview(int allotId)
Detail = t.GroupBy(group => group.PerforType).Select(s => new Detail = t.GroupBy(group => group.PerforType).Select(s => new
{ {
Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key, Title = string.IsNullOrEmpty(s.Key) ? "未知" : s.Key,
Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark)), Remark = string.Join(";", s.Where(w => !string.IsNullOrEmpty(w.Remark)).Select(w => w.Remark).Distinct()),
Value = s.Sum(sum => sum.Amount ?? 0) Value = s.Sum(sum => sum.Amount ?? 0)
}) })
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment