工资绩效改版

username@email.com

2023-02-28 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c

 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();