提交

username@email.com

2022-12-26 21d415aeaaa4de2cee01a146ad982fa8f47da2b1

 zhengcaioa/Services/IntentionCustomerService.cs

@@ -101,6 +101,10 @@
                    updateproject.Weixiner = intentionCustomer.Weixiner;
                    updateproject.Weixintime = intentionCustomer.Weixintime;

                    if (!string.IsNullOrEmpty(intentionCustomer.HuiyuanId))
                    {
                        updateproject.HuiyuanId = intentionCustomer.HuiyuanId;
                    }
                }

            _context.SaveChanges();
@@ -288,6 +292,7 @@
                         Modifier = a.Modifier,
                         Modifytime = a.Modifytime,
                         CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
                         Customertype = "档案客户",
                                 Yixiangtime = a.Yixiangtime,
                                 YixiangtimeName = a.Yixiangtime.HasValue? a.Yixiangtime.Value.ToString("yyyy-MM-dd"):"",
                                 Yixiang = a.Yixiang,
@@ -296,21 +301,21 @@
                                 Zuijinzhuizongtime = a.Zuijinzhuizongtime,
                                 ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
                             }
                    ).OrderByDescending(x => x.Modifytime).ToList();
                    );

            if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
            {
                query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim()).ToList();
                query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
            }
            if (!string.IsNullOrWhiteSpace(searchEntity.ShifouDianhua))
            {
                if (searchEntity.ShifouDianhua != "A")
                {
                    query = query.Where(a => a.Tel == null ||  a.Tel == "").ToList();
                    query = query.Where(a => a.Tel == null ||  a.Tel == "");
                }
                else
                {
                    query = query.Where(a => a.Tel != null && a.Tel != "").ToList();
                    query = query.Where(a => a.Tel != null && a.Tel != "");
                }
                
            }
@@ -318,7 +323,7 @@

        //if (searchEntity.totalrows == 0)
            searchEntity.totalrows = query.Count();
        var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
        var lianlist = query.OrderByDescending(x => x.Modifytime).Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
        data.LoadData(searchEntity, lianlist);
        return data;
    }