username@email.com
2021-07-01 57556b16aafbafebc7f9fc86745ac2ea83e7616d
zhengcaioa/Services/IntentionCustomerService.cs
@@ -90,6 +90,11 @@
                updateproject.Modifier = intentionCustomer.Modifier;
                updateproject.Modifytime = intentionCustomer.Modifytime;
                    updateproject.Yixiangtime = intentionCustomer.Yixiangtime;
                    updateproject.Yixiang = intentionCustomer.Yixiang;
                    updateproject.Dianxiaozhuanyuan = intentionCustomer.Dianxiaozhuanyuan;
                    updateproject.Zuijinzhuizongtime = intentionCustomer.Zuijinzhuizongtime;
            }
            _context.SaveChanges();
@@ -175,10 +180,18 @@
                DateTime.TryParse(Createtimes[1], out Createtimeend);
                Createtimeend = Createtimeend.AddDays(1);
            }
            DateTime Yixiangtimestart = DateTime.Now;
            DateTime Yixiangtimeend = DateTime.Now;
            if (!string.IsNullOrWhiteSpace(searchEntity.Yixiangtime))
            {
                string[] Yixiangtimes = searchEntity.Yixiangtime.Split("|");
                DateTime.TryParse(Yixiangtimes[0], out Yixiangtimestart);
                DateTime.TryParse(Yixiangtimes[1], out Yixiangtimeend);
               // Yixiangtimeend = Yixiangtimeend.AddDays(1);
            }
                var query = (from a in _context.IntentionCustomers
                     join b in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khly")
                     join b in listCode.Where(x => x.CodeTable == "IntentionCustomer" && x.CodeField == "khly")
                     on a.Khly equals b.CodeSn
                     join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
                     on a.Hyfl equals c.CodeSn
@@ -188,6 +201,12 @@
                     on a.Ywjl equals e.Id
                     into esss
                     from abi in esss.DefaultIfEmpty()
                             join f in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" )
                            on a.Dianxiaozhuanyuan equals f.Id
                            into fsss
                             from fff in fsss.DefaultIfEmpty()
                     join f in _context.Areas on a.Sheng equals f.CodeId
                     join g in _context.Areas on a.City equals g.CodeId
                     join h in _context.Areas on a.AreaId equals h.CodeId
@@ -204,6 +223,10 @@
                            && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
                               && (string.IsNullOrWhiteSpace(searchEntity.Creater) || a.Creater == searchEntity.Creater.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.Dianxiaozhuanyuan) || a.Dianxiaozhuanyuan == searchEntity.Dianxiaozhuanyuan.Trim())
                                    && (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
                                      && (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
                             select new IntentionCustomerDTO
                     {
                         Id = a.Id,
@@ -249,6 +272,13 @@
                         Modifier = a.Modifier,
                         Modifytime = a.Modifytime,
                         CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
                                 Yixiangtime = a.Yixiangtime,
                                 YixiangtimeName = a.Yixiangtime.HasValue? a.Yixiangtime.Value.ToString("yyyy-MM-dd"):"",
                                 Yixiang = a.Yixiang,
                                 Dianxiaozhuanyuan = a.Dianxiaozhuanyuan,
                                 DianxiaozhuanyuanName = fff.UserName,
                                 Zuijinzhuizongtime = a.Zuijinzhuizongtime,
                                 ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
                     }
                    ).OrderByDescending(x => x.Modifytime).ToList();