提交

username@email.com

2021-07-07 06e75f18b5b3b0fbfd25731c8b7324cc42df045f

 zhengcaioa/Services/CooperatecustomCustomerService.cs

@@ -93,7 +93,9 @@
                    updateproject.RecStatus = cooperatecustomCustomer.RecStatus;
                    updateproject.Modifier = cooperatecustomCustomer.Modifier;
                    updateproject.Modifytime = cooperatecustomCustomer.Modifytime;
                    updateproject.Weixin = cooperatecustomCustomer.Weixin;

                    updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
                }

                _context.SaveChanges();
@@ -201,6 +203,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) ) 


                         select new CooperatecustomCustomerDTO
                         {
@@ -248,6 +252,8 @@
                             Modifier = a.Modifier,
                             Modifytime = a.Modifytime,
                             CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
                             Weixin = a.Weixin,
                             Shifoutianjiaweixin = a.Shifoutianjiaweixin,
                         }
                        ).OrderByDescending(x => x.Modifytime).ToList();

@@ -301,5 +307,30 @@
            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return list;
        }

        public List<CooperatecustomCustomerDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
        {


            var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();

            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return list;
        }

        public List<CooperatecustomCustomerDTO> GetListsalaryqiandan(string userid, DateTime datemin, DateTime datemax)
        {


            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)
                                on a.Id equals b.Khdw 

                                select a
                                ).Distinct().ToList();

            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return list;
        }
    }
}