From ed3015095f1b0e88bc579877c678a3fac191381f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 14:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/SimService.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/SimService.cs b/zhengcaioa/Services/SimService.cs
index 674535e..e932f53 100644
--- a/zhengcaioa/Services/SimService.cs
+++ b/zhengcaioa/Services/SimService.cs
@@ -374,7 +374,19 @@
year = int.Parse(searchEntity.searchtime);
}
- var dt = (from c in _context.SimCostYearView where c.bill_year==year orderby c.sim select c).ToList();
+ var dt = (from c in _context.SimCostYearView where c.bill_year==year select c).ToList();
+ //娣诲姞鏈湁璁板綍鐨�
+ var stringId = dt.Select(c => c.sim_id).ToList();
+ var nolog = (from c in _context.SimBindView where !stringId.Contains(c.Id) select c).ToList();
+ foreach(var item in nolog)
+ {
+ SimCostYearView ss = new SimCostYearView();
+ ss.bill_year = year;
+ ss.sim_id = item.Id;
+ ss.sim = item.simcard;
+ dt.Add(ss);
+ }
+ dt = dt.OrderBy(c => c.sim).ToList();
if (!string.IsNullOrEmpty(searchEntity.searchsim))
{
--
Gitblit v1.9.1