username@email.com
2021-07-19 57ebcb39881c6a01cab9fca4870bd4c736e2d5b2
zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -94,8 +94,10 @@
                    updateproject.Modifier = cooperatecustomCustomer.Modifier;
                    updateproject.Modifytime = cooperatecustomCustomer.Modifytime;
                    updateproject.Weixin = cooperatecustomCustomer.Weixin;
                    updateproject.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
                    updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
                    updateproject.Weixintime = cooperatecustomCustomer.Weixintime;
                    updateproject.Weixiner = cooperatecustomCustomer.Weixiner;
                }
                _context.SaveChanges();
@@ -203,8 +205,8 @@
                              && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim())
                               && (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null) )
                                 && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) ||  a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || a.HuiyuanId == searchEntity.HuiyuanId.Trim())
                         select new CooperatecustomCustomerDTO
                         {
@@ -254,12 +256,15 @@
                             CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
                             Weixin = a.Weixin,
                             Shifoutianjiaweixin = a.Shifoutianjiaweixin,
                             HuiyuanId = a.HuiyuanId,
                             Weixiner = a.Weixiner,
                             Weixintime = a.Weixintime,
                         }
                        ).OrderByDescending(x => x.Modifytime).ToList();
            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            data.LoadData(searchEntity, lianlist);
@@ -323,7 +328,7 @@
            var listPosition =( from a in _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Creater == userid)
                                join b in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Shoulitime >= datemin && x.Shoulitime < datemax)
                                join b in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Createtime >= datemin && x.Createtime < datemax)
                                on a.Id equals b.Khdw 
                                select a
@@ -332,5 +337,15 @@
            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return list;
        }
        public List<CooperatecustomCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax)
        {
            var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Weixiner == userid && r.Weixintime >= datemin && r.Weixintime < datemax).ToList();
            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return list;
        }
    }
}