From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 八月 2021 14:29:15 +0800
Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增，短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新 项目新增 增加字段：采购预算 万元 工作考评 考聘不称职当天无工资
---
zhengcaioa/Services/SimService.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/SimService.cs b/zhengcaioa/Services/SimService.cs
index 674535e..4b49961 100644
--- a/zhengcaioa/Services/SimService.cs
+++ b/zhengcaioa/Services/SimService.cs
@@ -142,7 +142,7 @@
dt = dt.Where(c => !string.IsNullOrEmpty(c.username) && c.username.Contains(searchEntity.username)).ToList();
}
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = dt.Count();
var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -374,14 +374,26 @@
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))
{
dt = dt.Where(c => c.sim==searchEntity.searchsim).ToList();
}
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = dt.Count();
var signinList = dt.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
--
Gitblit v1.9.1